Merge remote-tracking branch 'origin/master'

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-form-model-item label="辅料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
-              <a-input v-model="model.typeId" placeholder="请输入类型id"  ></a-input>
+              <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-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
-              <a-input v-model="model.picture" placeholder="请输入图片"  ></a-input>
+              <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"
+                v-model="model.typeName"
-                field="id"
+                field="typeName"
-                org-fields="id"
+                org-fields="id,content"
-                dest-fields="id"
+                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: [
+          // money: [
-            { required: false},
+          //   { required: false},
-            { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
+          //   { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
-          ],
+          // ],
-          retailPrice: [
+          // retailPrice: [
-            { required: false},
+          //   { required: false},
-            { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
+          //   { 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",

ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue

@@ -11,7 +11,8 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="形式">
-              <j-dict-select-tag placeholder="请选择形式" dictCode="style_shape" v-model="queryParam.shape" ></j-dict-select-tag>
+              <j-dict-select-tag placeholder="请选择形式" dictCode="style_shape"
+                                 v-model="queryParam.shape"></j-dict-select-tag>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -51,16 +52,22 @@
       <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
       </a-dropdown>
     </div>
 
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
 
@@ -83,7 +90,8 @@
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img v-else :src="getImgView(text)" height="25px" alt=""
+               style="max-width:80px;font-size: 12px;font-style: italic;"/>
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@@ -225,6 +233,7 @@
         importExcelUrl: "zyclothsstyle/zyClothsStyle/importExcel",
 
       },
+      styleId: '',
       dictOptions: {},
       superFieldList: [],
     }
@@ -279,15 +288,21 @@
     //管理工序
     jumpPage5(record) {
       this.$router.push({
-          path: '/process/ZyProcessList',
+        //path: '/process/ZyProcessList',
+        path: '/zystylemodular/ZyStyleModularList',
         query: {  // 路由携带参数
-            'styleId': record.id,
+          'id': record.id,
         }
       });
     },
     getSuperFieldList() {
       let fieldList = [];
-        fieldList.push({type:'popup',value:'typeId',text:'类型id', popup:{code:'zy_cloths_type',field:'type_name',orgFields:'type_name',destFields:'id'}})
+      fieldList.push({
+        type: 'popup',
+        value: 'typeId',
+        text: '类型id',
+        popup: {code: 'zy_cloths_type', field: 'type_name', orgFields: 'type_name', destFields: 'id'}
+      })
       fieldList.push({type: 'string', value: 'shape', text: '形式', dictCode: ''})
       fieldList.push({type: 'string', value: 'nums', text: '编号', dictCode: ''})
       fieldList.push({type: 'string', value: 'styleNames', text: '名称', dictCode: ''})

ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularForm.vue

@@ -5,12 +5,16 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="款式id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
-              <a-input v-model="model.styleId" placeholder="请输入款式id"  ></a-input>
+<!--              <a-input v-model="model.styleId" placeholder="请输入款式id"  ></a-input>-->
+              <j-dict-select-tag v-model="model.styleId"  placeholder="请选择款式"
+                                 dict-code="zy_cloths_style,style_names,id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="工序id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
-              <a-input v-model="model.processId" placeholder="请输入工序id"  ></a-input>
+<!--              <a-input v-model="model.processId" placeholder="请输入工序id"  ></a-input>-->
+              <j-dict-select-tag v-model="model.processId"  placeholder="请选择款式"
+                                 dict-code="zy_process,process_name,id" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -39,6 +43,7 @@
     data () {
       return {
         model:{
+          styleId:'',
          },
         labelCol: {
           xs: { span: 24 },
@@ -68,8 +73,9 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
-      add () {
+      add1 (id) {
         this.edit(this.modelDefault);
+        this.model.styleId = id;
       },
       edit (record) {
         this.model = Object.assign({}, record);

ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal__Style#Drawer.vue

@@ -33,10 +33,10 @@
       }
     },
     methods: {
-      add () {
+      add1 (id) {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add();
+          this.$refs.realForm.add1(id);
         })
       },
       edit (record) {

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

@@ -37,9 +37,14 @@ 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")
     @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "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;