2022-11-14-01-bug

2 years ago · 2a65a722fb
parent dc84dacd93
commit 2a65a722fb
16 changed files with 52 additions and 21 deletions
--- a/ant-design-vue-jeecg/src/views/cloths/ZyClothsComponentList.vue
+++ b/ant-design-vue-jeecg/src/views/cloths/ZyClothsComponentList.vue
@ -138,7 +138,7 @@
            dataIndex: 'description'
          },
          {
-            title:'图片地址',
+            title:'图片',
            align:"center",
            dataIndex: 'pictureUrl',
            scopedSlots: {customRender: 'imgSlot'}
@ -190,7 +190,7 @@
        fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
        fieldList.push({type:'string',value:'partsName',text:'部件名称',dictCode:''})
        fieldList.push({type:'string',value:'description',text:'描述',dictCode:''})
-        fieldList.push({type:'string',value:'pictureUrl',text:'图片地址',dictCode:''})
+        fieldList.push({type:'string',value:'pictureUrl',text:'图片',dictCode:''})
        fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,nums'})
        fieldList.push({type:'string',value:'enterpriseId',text:'企业',dictCode:''})
        this.superFieldList = fieldList
--- a/ant-design-vue-jeecg/src/views/cloths/modules/ZyClothActionForm.vue
+++ b/ant-design-vue-jeecg/src/views/cloths/modules/ZyClothActionForm.vue
@ -15,7 +15,7 @@
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descr">
-              <a-input v-model="model.descr" placeholder="请输入描述"  ></a-input>
+              <a-textarea v-model="model.descr" rows="4" placeholder="请输入描述"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
--- a/ant-design-vue-jeecg/src/views/cloths/modules/ZyClothsComponentForm.vue
+++ b/ant-design-vue-jeecg/src/views/cloths/modules/ZyClothsComponentForm.vue
@ -15,11 +15,11 @@
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
-              <a-input v-model="model.description" placeholder="请输入描述"  ></a-input>
+              <a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
-            <a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">
              <j-image-upload isMultiple  v-model="model.pictureUrl" ></j-image-upload>
            </a-form-model-item>
          </a-col>
--- a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
@ -102,7 +102,7 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
-            <a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
              <j-image-upload isMultiple  v-model="model.imageUrl" ></j-image-upload>
            </a-form-model-item>
          </a-col>
--- a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricFormDetail.vue
+++ b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricFormDetail.vue
@ -78,7 +78,7 @@
          <a-descriptions-item label="物流运费">
            {{model.logisticsDetail}}
          </a-descriptions-item>
-          <a-descriptions-item label="图片地址">
+          <a-descriptions-item label="图片">
            <img style="width: 100px;" :src="model.imageUrl">
          </a-descriptions-item>
          <a-descriptions-item label="二维码">
--- a/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyOrderFabricFormDetail.vue
+++ b/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyOrderFabricFormDetail.vue
@ -97,7 +97,7 @@
          <a-descriptions-item label="物流运费">
            {{model.logisticsDetail}}
          </a-descriptions-item>
-          <a-descriptions-item label="图片地址">
+          <a-descriptions-item label="图片">
            <img style="width: 100px;" :src="model.imageUrl">
          </a-descriptions-item>
          <a-descriptions-item label="二维码">
--- a/ant-design-vue-jeecg/src/views/mall/ZyPostureList.vue
+++ b/ant-design-vue-jeecg/src/views/mall/ZyPostureList.vue
@ -116,7 +116,7 @@
            dataIndex: 'name'
          },
          {
-            title:'图片地址',
+            title:'图片',
            align:"left",
            dataIndex: 'imageUrl',
            scopedSlots: {customRender: 'imgSlot'}
--- a/ant-design-vue-jeecg/src/views/mall/clothSample/modules/ZyClothSampleForm.vue
+++ b/ant-design-vue-jeecg/src/views/mall/clothSample/modules/ZyClothSampleForm.vue
@ -15,7 +15,7 @@
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descr">
-              <a-input v-model="model.descr" placeholder="请输入描述"  ></a-input>
+              <a-textarea v-model="model.descr" rows="4" placeholder="请输入描述"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
--- a/ant-design-vue-jeecg/src/views/mall/modules/ZyMallPostureForm.vue
+++ b/ant-design-vue-jeecg/src/views/mall/modules/ZyMallPostureForm.vue
@ -14,7 +14,7 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
-            <a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
              <a-input v-model="model.imageUrl" placeholder="请输入图片地址"  ></a-input>
            </a-form-model-item>
          </a-col>
--- a/ant-design-vue-jeecg/src/views/mall/modules/ZyPostureModal.vue
+++ b/ant-design-vue-jeecg/src/views/mall/modules/ZyPostureModal.vue
@ -25,7 +25,7 @@
            >
          </j-tree-select>
        </a-form-model-item>
-        <a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
+        <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
          <j-image-upload isMultiple  v-model="model.imageUrl" ></j-image-upload>
        </a-form-model-item>
        
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
@ -149,7 +149,7 @@
            dataIndex: 'description'
          },
          {
-            title:'图片地址',
+            title:'图片',
            align:"center",
            dataIndex: 'pictureUrl',
            scopedSlots: {customRender: 'imgSlot'}
@ -213,7 +213,7 @@
        fieldList.push({type:'string',value:'partsName',text:'部件名称',dictCode:''})
        fieldList.push({type:'string',value:'componentType',text:'部件类型',dictCode:''})
        fieldList.push({type:'string',value:'description',text:'描述',dictCode:''})
-        fieldList.push({type:'string',value:'pictureUrl',text:'图片地址',dictCode:''})
+        fieldList.push({type:'string',value:'pictureUrl',text:'图片',dictCode:''})
        fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,id'})
        fieldList.push({type:'string',value:'enterpriseId',text:'企业',dictCode:''})
        this.superFieldList = fieldList
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
@ -176,7 +176,7 @@ export default {
          dataIndex: 'enterpriseId_dictText'
        },
        {
-          title: '图片地址',
+          title: '图片',
          align: "center",
          dataIndex: 'pictureUrl',
          scopedSlots: {customRender: 'imgSlot'}
@ -238,7 +238,7 @@ export default {
      fieldList.push({type: 'string', value: 'description', text: '描述', dictCode: ''})
      fieldList.push({type: 'string', value: 'clothsTypeId', text: '衣服类型', dictCode: 'zy_cloths_type,type_name,id'})
      fieldList.push({type: 'string', value: 'enterpriseId', text: '企业', dictCode: ''})
-      fieldList.push({type: 'string', value: 'pictureUrl', text: '图片地址', dictCode: ''})
+      fieldList.push({type: 'string', value: 'pictureUrl', text: '图片', dictCode: ''})
      this.superFieldList = fieldList
    }
  }
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
@ -15,7 +15,7 @@
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descr">
-              <a-input v-model="model.descr" placeholder="请输入描述"  ></a-input>
+              <a-textarea v-model="model.descr" rows="4" placeholder="请输入描述"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
@ -20,11 +20,11 @@
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
-              <a-input v-model="model.description" placeholder="请输入描述"  ></a-input>
+              <a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
-            <a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">
              <j-image-upload isMultiple  v-model="model.pictureUrl" ></j-image-upload>
            </a-form-model-item>
          </a-col>
@ -85,6 +85,19 @@
        },
        confirmLoading: false,
        validatorRules: {
+          nums: [
+            { required: true, message: '请输入编号!'},
+          ],
+          partsName: [
+            { required: true, message: '请输入部件名称!'},
+          ],
+          modularId: [
+            { required: true, message: '请选择模块!'},
+          ],
+          modularType: [
+            { required: true, message: '请选择制衣模块类型!'},
+          ],
+
        },
        url: {
          add: "/base/zyClothsComponent/add",
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
@ -20,7 +20,7 @@
 <!--          </a-col>-->
          <a-col :span="24">
            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
-              <a-input v-model="model.description" placeholder="请输入描述"  ></a-input>
+              <a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
@ -39,7 +39,7 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
-            <a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">
              <j-image-upload isMultiple  v-model="model.pictureUrl" ></j-image-upload>
            </a-form-model-item>
          </a-col>
@ -80,6 +80,15 @@
        },
        confirmLoading: false,
        validatorRules: {
+          nums: [
+            { required: true, message: '请输入编号!'},
+          ],
+          modularName: [
+            { required: true, message: '请输入模块名称!'},
+          ],
+          clothsTypeId: [
+            { required: true, message: '请选择衣服类型!'},
+          ]
        },
        url: {
          add: "/base/zyClothsModular/add",
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentForm.vue
@ -55,6 +55,15 @@
        },
        confirmLoading: false,
        validatorRules: {
+          componentId: [
+            { required: true, message: '请选择部件!'},
+          ],
+          processId: [
+            { required: true, message: '请选择工艺!'},
+          ],
+          bottleneck: [
+            { required: true, message: '是否瓶颈工序!'},
+          ],
        },
        url: {
          add: "/pro/zyProcessComponent/add",