2022-11-14-02-bug

ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue

@@ -124,9 +124,9 @@
             }
           },
           {
-            title:'类型id',
+            title:'类型',
             align:"center",
-            dataIndex: 'typeId'
+            dataIndex: 'typeId_dictText'
           },
           {
             title:'编号',

ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue

@@ -4,10 +4,20 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="类型id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
-              <a-input v-model="model.typeId" placeholder="请输入类型id"  ></a-input>
+            <a-form-model-item label="辅料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
+              <j-popup
+                v-model="model.typeName"
+                field="typeName"
+                org-fields="id,contents"
+                dest-fields="typeId,typeName"
+                code="zy_accessories_type"
+                :multi="false"
+                @input="popupCallback"
+              />
+              <a-input v-model="model.typeId" hidden />
             </a-form-model-item>
           </a-col>
+
           <a-col :span="24">
             <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
               <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>
@@ -19,8 +29,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="picture">
-              <a-input v-model="model.picture" placeholder="请输入图片"  ></a-input>
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
+              <j-image-upload isMultiple  v-model="model.picture" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -84,6 +94,15 @@
         },
         confirmLoading: false,
         validatorRules: {
+          typeId: [
+            { required: true, message: '请选择类型!'},
+          ],
+          nums: [
+            { required: true, message: '请输入编号!'},
+          ],
+          contents: [
+            { required: true, message: '请输入名称!'},
+          ],
         },
         url: {
           add: "/accessories/zyAccessories/add",
@@ -138,6 +157,10 @@
 
         })
       },
+      popupCallback(value,row){
+        this.model = Object.assign(this.model, row);
+        console.log(row);
+      },
     }
   }
 </script>

ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue

@@ -6,14 +6,15 @@
           <a-col :span="24">
             <a-form-model-item label="面料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
               <j-popup
-                v-model="model.typeId"
-                field="id"
-                org-fields="id"
-                dest-fields="id"
+                v-model="model.typeName"
+                field="typeName"
+                org-fields="id,content"
+                dest-fields="typeId,typeName"
                 code="zy_fabric_type"
                 :multi="false"
                 @input="popupCallback"
               />
+              <a-input v-model="model.typeId" hidden />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -53,7 +54,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
-              <a-input-number v-model="model.money" placeholder="请输入单价" style="width: 100%" />
+              <a-input-number v-model="model.money" placeholder="请输入单价" :precision="2" :min="0" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -136,6 +137,7 @@
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
   import OnlineCamera from './Components/OnlineCamera'
+  import pick from 'lodash.pick'
 
   export default {
     name: 'ZyFabricForm',
@@ -181,14 +183,14 @@
           name: [
             { required: true, message: '请输入名称!'},
           ],
-          money: [
-            { required: false},
-            { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
-          ],
-          retailPrice: [
-            { required: false},
-            { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
-          ],
+          // money: [
+          //   { required: false},
+          //   { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
+          // ],
+          // retailPrice: [
+          //   { required: false},
+          //   { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
+          // ],
           location: [
             { required: false},
             { pattern: /^.{0,30}$/, message: '长度不能超过30位字符'},
@@ -256,6 +258,10 @@
       changeOnlineVisible(value){
         this.model.imageUrl=value;
       },
+      popupCallback(value,row){
+        this.model = Object.assign(this.model, row);
+      },
+
 
     }
   }

ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue

@@ -71,6 +71,19 @@
         },
         confirmLoading: false,
         validatorRules: {
+          freq: [
+            { required: true, message: '请输入频率!'},
+          ],
+          machineTmu: [
+            { required: true, message: '请输入机器TMU!'},
+          ],
+          manualTmu: [
+            { required: true, message: '请输入手工TMU!'},
+          ],
+          nums: [
+            { required: true, message: '请输入编号!'},
+          ],
+
         },
         url: {
           add: "/base/zyClothAction/add",

ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue

@@ -15,12 +15,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="工艺描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processDescribe">
-              <a-input v-model="model.processDescribe" placeholder="请输入工艺描述"  ></a-input>
+              <a-textarea v-model="model.processDescribe" rows="4" placeholder="请输入工艺描述"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="做工说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mkExplain">
-              <a-input v-model="model.mkExplain" placeholder="请输入做工说明"  ></a-input>
+              <a-textarea v-model="model.mkExplain" rows="4" placeholder="请输入做工说明"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -225,6 +225,14 @@
            fabricNum: [
               { required: true, message: '请输入面料代码!'},
            ],
+
+          processCode: [
+            { required: true, message: '请输入工序代码!'},
+          ],
+          processName: [
+            { required: true, message: '请输入工序名称!'},
+          ],
+
         },
         url: {
           add: "/base/zyProcess/add",

jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java

@@ -37,8 +37,13 @@ public class ZyAccessories implements Serializable {
     private java.lang.String id;
 	/**类型id*/
 	@Excel(name = "类型id", width = 15)
+    @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id")
     @ApiModelProperty(value = "类型id")
     private java.lang.String typeId;
+
+    @ApiModelProperty(value = "类型")
+    private java.lang.String typeName;
+
 	/**编号*/
 	@Excel(name = "编号", width = 15)
     @ApiModelProperty(value = "编号")

jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java

@@ -70,6 +70,11 @@ public class ZyFabric implements Serializable {
     @Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "id")
     @ApiModelProperty(value = "类型")
     private java.lang.String typeId;
+
+    /**面料类型名称*/
+    @ApiModelProperty(value = "类型")
+    private java.lang.String typeName;
+
     /**图片地址*/
     @ApiModelProperty(value = "图片地址")
     private java.lang.String pictureUrl;