Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform

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) {