Merge remote-tracking branch 'origin/master'

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

@@ -8,6 +8,11 @@
 <!--              <a-input v-model="model.addPeople" placeholder="请输入添加人"  ></a-input>-->
 <!--            </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="请输入编号"  disabled></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="频率" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="freq">
               <a-input-number v-model="model.freq" placeholder="请输入频率" style="width: 100%" />
@@ -28,11 +33,7 @@
               <a-input-number v-model="model.manualTmu" placeholder="请输入手工TMU" style="width: 100%" />
             </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>
-            </a-form-model-item>
-          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -60,6 +61,7 @@
       return {
         model:{
           addPeople:'',
+          nums:'',
          },
         labelCol: {
           xs: { span: 24 },
@@ -88,7 +90,8 @@
         url: {
           add: "/base/zyClothAction/add",
           edit: "/base/zyClothAction/edit",
-          queryById: "/base/zyClothAction/queryById"
+          queryById: "/base/zyClothAction/queryById",
+          sort:"/base/zyClothAction/sort"
         }
       }
     },
@@ -100,7 +103,17 @@
     created () {
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
-
+      var n=5
+      getAction(this.url.sort,null).then((res)=>{
+        // console.log(res.message)
+        var num=parseInt(res.message,10)+1
+        num=num.toString()
+        while(num.length<n){
+          num="0"+num
+        }
+        this.model.nums="M"+num;
+        // console.log(this.model.nums)
+      })
     },
     methods: {
       add () {

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

@@ -5,7 +5,7 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :sm="5">
-            <a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
+            <a-form-model-item label="工具" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
               <a-input v-model="queryParam.toolid" placeholder="请输入工具名称"  ></a-input>
             </a-form-model-item>
           </a-col>
@@ -79,12 +79,7 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
 
-          <a-divider type="vertical" />
-
-                <a @click="handleDetail(record)">详情</a>
-               <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -94,7 +89,7 @@
       </a-table>
     </div>
 
-    <zy-operationtool-modal ref="modalForm" @ok="modalFormOk"></zy-operationtool-modal>
+    <zy-operationtool-modal   @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-operationtool-modal>
   </a-card>
 </template>
 
@@ -103,7 +98,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyOperationtoolModal from "@/views/operationtool/modules/ZyOperationtoolModal"
+  import ZyOperationtoolModal from "./ZyOperationtoolModal"
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
@@ -196,6 +191,9 @@
       },
       initDictConfig(){
       },
+      valueChange(value){
+        if (value) this.loadData()
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'operationid',text:'工序',dictCode:'zy_process,process_name,id'})

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

@@ -0,0 +1,94 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+<!--    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
+   <zy-tool-list ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-tool-list>
+  </j-modal>
+</template>
+
+<script>
+
+
+  import {postAction} from "../../../api/manage";
+  import ZyToolList from "./list/ZyToolList";
+  export default {
+    name: 'ZyToolModal',
+    components: {
+      ZyToolList,
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        model:{
+          operationid:'',
+          toolid:'',
+        },
+        url:{
+          add:"/operationtool/zyOperationtool/add"
+        }
+      }
+    },
+    methods: {
+      // add () {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.add();
+      //   })
+      // },
+      add1 (id) {
+        this.visible=true
+        this.$nextTick(()=>{
+          // this.$refs.realForm.add1(id);
+          this.model.operationid=id;
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      // edit1 (record,code) {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.edit1(record,code);
+      //   })
+      // },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      chuancan(res){
+        this.model.toolid=res;
+      },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

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

@@ -79,13 +79,13 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
+<!--          <a @click="handleEdit1(record,code)">编辑</a>-->
 
-          <a-divider type="vertical" />
+<!--          <a-divider type="vertical" />-->
 
 
-                <a @click="handleDetail(record)">详情</a>
+<!--                <a @click="handleDetail(record)">详情</a>-->
-        <a-divider type="vertical" />
+<!--        <a-divider type="vertical" />-->
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -95,7 +95,7 @@
       </a-table>
     </div>
 
-    <zy-process-accessories-modal ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
+    <zy-process-accessories-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
   </a-card>
 </template>
 
@@ -104,7 +104,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyProcessAccessoriesModal from '@/views/cloths/modules/ZyProcessAccessoriesModal'
+  import ZyProcessAccessoriesModal from './ZyProcessAccessoriesModal'
 
   export default {
     name: 'ZyProcessAccessoriesList',
@@ -195,6 +195,9 @@
         this.visible = true;
 
       },
+      valueChange(value){
+        if (value) this.loadData()
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

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

@@ -0,0 +1,94 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+<!--    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
+   <zy-accessories-list ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-accessories-list>
+  </j-modal>
+</template>
+
+<script>
+
+
+  import {postAction} from "../../../api/manage";
+  import ZyAccessoriesList from "./list/ZyAccessoriesList";
+  export default {
+    name: 'ZyProcessActionModal',
+    components: {
+      ZyAccessoriesList,
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        model:{
+          processId:'',
+          accessoriesId:'',
+        },
+        url:{
+          add:"/pro/zyProcessAccessories/add"
+        }
+      }
+    },
+    methods: {
+      // add () {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.add();
+      //   })
+      // },
+      add1 (id) {
+        this.visible=true
+        this.$nextTick(()=>{
+          // this.$refs.realForm.add1(id);
+          this.model.processId=id;
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      // edit1 (record,code) {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.edit1(record,code);
+      //   })
+      // },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      chuancan(res){
+        this.model.accessoriesId=res;
+      },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

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

@@ -79,22 +79,25 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
 
-          <a-divider type="vertical" />
 
-                <a @click="handleDetail(record)">详情</a>
+<!--          <a-divider type="vertical" />-->
-          <a-divider type="vertical" />
+
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--          <a-divider type="vertical" />-->
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
-
+           <a-divider type="vertical" />
+                    <a @click="up(record.id)">升序</a>
+           <a-divider type="vertical" />
+           <a @click="down(record.id)">降序</a>
         </span>
 
       </a-table>
     </div>
 
-    <zy-process-action-modal ref="modalForm" @ok="modalFormOk"></zy-process-action-modal>
+    <zy-process-action-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-action-modal>
   </a-card>
 </template>
 
@@ -105,6 +108,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyProcessActionModal from './ZyProcessActionModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import {getAction} from "@api/manage";
 
   export default {
     name: 'ZyProcessActionList',
@@ -173,6 +177,8 @@
           deleteBatch: "/pro/zyProcessAction/deleteBatch",
           exportXlsUrl: "/pro/zyProcessAction/exportXls",
           importExcelUrl: "pro/zyProcessAction/importExcel",
+          up:"/pro/zyProcessAction/up",
+          down:"/pro/zyProcessAction/down"
 
         },
         dictOptions:{},
@@ -193,12 +199,30 @@
        edit (record) {
         this.id = record;
         this.queryParam.processId=this.id;
-        console.log("燕慧森1号")
          this.url.list='/pro/zyProcessAction/list1'
         this.loadData();
         this.visible = true;
 
       },
+      up(id){
+         getAction(this.url.up,{id:id}).then((res)=>{
+             if(res.success){
+               this.$message.success(res.message);
+             }else{
+               this.$message.warning(res.message);
+             }
+      })},
+           down(id){
+          getAction(this.url.down,{id:id}).then((res)=>{
+              if(res.success){
+                this.$message.success(res.message);
+              }else{
+                this.$message.warning(res.message);
+              }
+      })},
+      valueChange(value){
+        if (value) this.loadData()
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

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

@@ -8,37 +8,47 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>
+<!--    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
+    <zy-cloth-action-list ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-cloth-action-list>
   </j-modal>
 </template>
 
 <script>
 
-  import ZyProcessActionForm from './ZyProcessActionForm'
+  import ZyClothActionList from "./list/ZyClothActionList";
+  import {postAction} from "../../../api/manage";
   export default {
     name: 'ZyProcessActionModal',
     components: {
-      ZyProcessActionForm
+      ZyClothActionList,
     },
     data () {
       return {
         title:'',
         width:800,
         visible: false,
-        disableSubmit: false
+        disableSubmit: false,
+        model:{
+          processId:'',
+          actionId:'',
+        },
+        url:{
+          add:"/pro/zyProcessAction/add"
+        }
       }
     },
     methods: {
-      add () {
+      // add () {
-        this.visible=true
+      //   this.visible=true
-        this.$nextTick(()=>{
+      //   this.$nextTick(()=>{
-          this.$refs.realForm.add();
+      //     this.$refs.realForm.add();
-        })
+      //   })
-      },
+      // },
       add1 (id) {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add1(id);
+          // this.$refs.realForm.add1(id);
+          this.model.processId=id;
         })
       },
       edit (record) {
@@ -47,19 +57,31 @@
           this.$refs.realForm.edit(record);
         })
       },
-      edit1 (record,code) {
+      // edit1 (record,code) {
-        this.visible=true
+      //   this.visible=true
-        this.$nextTick(()=>{
+      //   this.$nextTick(()=>{
-          this.$refs.realForm.edit1(record,code);
+      //     this.$refs.realForm.edit1(record,code);
-        })
+      //   })
-      },
+      // },
       close () {
         this.$emit('close');
         this.visible = false;
       },
-      handleOk () {
+      chuancan(res){
-        this.$refs.realForm.submitForm();
+        this.model.actionId=res;
+        console.log(res)
       },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
       submitCallback(){
         this.$emit('ok');
         this.visible = false;

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

@@ -84,12 +84,12 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
+<!--          <a @click="handleEdit1(record,code)">编辑</a>-->
 
-           <a-divider type="vertical" />
+<!--           <a-divider type="vertical" />-->
 
-                <a @click="handleDetail(record)">详情</a>
+<!--                <a @click="handleDetail(record)">详情</a>-->
-                      <a-divider type="vertical" />
+<!--                      <a-divider type="vertical" />-->
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -99,7 +99,7 @@
       </a-table>
     </div>
 
-    <zy-process-fabric-modal ref="modalForm" @ok="modalFormOk"></zy-process-fabric-modal>
+    <zy-process-fabric-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-fabric-modal>
   </a-card>
 </template>
 
@@ -108,7 +108,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyProcessFabricModal from '@/views/cloths/modules/ZyProcessFabricModal'
+  import ZyProcessFabricModal from './ZyProcessFabricModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
@@ -199,6 +199,9 @@
         this.loadData();
         this.visible = true;
       },
+      valueChange(value){
+        if (value) this.loadData()
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

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

@@ -0,0 +1,94 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+<!--    <zy-process-action-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-form>-->
+   <zy-fabric-list ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-fabric-list>
+  </j-modal>
+</template>
+
+<script>
+
+
+  import {postAction} from "../../../api/manage";
+  import ZyFabricList from "./list/ZyFabricList";
+  export default {
+    name: 'ZyProcessActionModal',
+    components: {
+      ZyFabricList,
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        model:{
+          processId:'',
+          fabricId:'',
+        },
+        url:{
+          add:"/pro/zyProcessFabric/add"
+        }
+      }
+    },
+    methods: {
+      // add () {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.add();
+      //   })
+      // },
+      add1 (id) {
+        this.visible=true
+        this.$nextTick(()=>{
+          // this.$refs.realForm.add1(id);
+          this.model.processId=id;
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      // edit1 (record,code) {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.edit1(record,code);
+      //   })
+      // },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      chuancan(res){
+        this.model.fabricId=res;
+      },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

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

@@ -84,13 +84,6 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit1(record,code)">编辑</a>
-
-          <a-divider type="vertical" />
-
-
-                <a @click="handleDetail(record)">详情</a>
-               <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -100,7 +93,7 @@
       </a-table>
     </div>
 
-    <zy-process-machine-modal ref="modalForm" @ok="modalFormOk"></zy-process-machine-modal>
+    <zy-process-machine-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-machine-modal>
   </a-card>
 </template>
 
@@ -109,7 +102,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyProcessMachineModal from '@/views/cloths/modules/ZyProcessMachineModal'
+  import ZyProcessMachineModal from './ZyProcessMachineModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
@@ -194,10 +187,12 @@
       },
     },
     methods: {
+      valueChange(value){
+        if (value) this.loadData()
+      },
       edit (record) {
         this.id = record;
         this.queryParam.processId=this.id;
-        console.log("燕慧森1号")
         this.loadData();
         this.visible = true;
 

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

@@ -0,0 +1,84 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+   <zy-machine ref="realForm"   @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-machine>
+  </j-modal>
+</template>
+
+<script>
+
+ import ZyMachine from "./list/ZyMachine";
+  import {postAction} from "../../../api/manage";
+  export default {
+    name: 'ZyProcessMachineModal',
+    components: {
+      ZyMachine
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        model:{
+          machineId:'',
+          processId:''
+        },
+        url:{
+          add: "/pro/zyProcessMachine/add",
+        }
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      add1 (id) {
+        this.visible=true
+        this.model.processId=id;
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      chuancan(res){
+        this.model.machineId=res;
+        console.log(res)
+      },
+      handleOk () {
+        postAction(this.url.add,this.model).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+          this.$emit('valueChange',1)
+          this.close()
+
+        })},
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

ant-design-vue-jeecg/src/views/process/modules/list/ZyAccessoriesList.vue

@@ -0,0 +1,159 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+
+    </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>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange1}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+
+      </a-table>
+    </div>
+
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ZyAccessoriesList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+
+    },
+    data () {
+      return {
+        description: 'zy_accessories管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'nums'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'contents'
+          },
+
+        ],
+        url: {
+          list: "/accessories/zyAccessories/list",
+          delete: "/accessories/zyAccessories/delete",
+          deleteBatch: "/accessories/zyAccessories/deleteBatch",
+          exportXlsUrl: "/accessories/zyAccessories/exportXls",
+          importExcelUrl: "accessories/zyAccessories/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'typeId',text:'类型id'})
+        fieldList.push({type:'string',value:'nums',text:'编号'})
+        fieldList.push({type:'string',value:'contents',text:'名称'})
+        fieldList.push({type:'string',value:'picture',text:'图片'})
+        fieldList.push({type:'string',value:'material',text:'材质'})
+        fieldList.push({type:'string',value:'specs',text:'规格'})
+        fieldList.push({type:'int',value:'store',text:'库存量'})
+        fieldList.push({type:'string',value:'supplierInfo',text:'供货商信息'})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyAccessoriesFormDetail.showModal(id)
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

ant-design-vue-jeecg/src/views/process/modules/list/ZyClothActionList.vue

@@ -0,0 +1,214 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :sm="5">
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >
+              <a-input v-model="queryParam.descr" placeholder="请输入描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :sm="5">
+            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
+              <a-input v-model="queryParam.nums" placeholder="请输入编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('zy_cloth_action')">导出</a-button>-->
+<!--      &lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--      &lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <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>-->
+<!--        <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>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange1}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+<!--        <span slot="action" slot-scope="text, record">-->
+<!--          <a @click="handleEdit(record)">编辑</a>-->
+
+<!--          <a-divider type="vertical" />-->
+
+<!--                <a @click="handleDetail(record.id)">详情</a>-->
+<!--              <a-divider type="vertical" />-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+
+<!--        </span>-->
+
+      </a-table>
+    </div>
+
+<!--    <zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal>-->
+<!--    <ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>-->
+  </a-card>
+</template>
+
+<script>
+
+  import '@assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ZyClothActionList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+
+    },
+    data () {
+      return {
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        description: 'zy_cloth_action管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'nums'
+          },
+          {
+            title:'描述',
+            align:"center",
+            dataIndex: 'descr'
+          },
+
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/base/zyClothAction/list",
+          delete: "/base/zyClothAction/delete",
+          deleteBatch: "/base/zyClothAction/deleteBatch",
+          exportXlsUrl: "/base/zyClothAction/exportXls",
+          importExcelUrl: "base/zyClothAction/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'addPeople',text:'添加人',dictCode:''})
+        fieldList.push({type:'int',value:'freq',text:'频率',dictCode:''})
+        fieldList.push({type:'string',value:'descr',text:'描述',dictCode:''})
+        fieldList.push({type:'int',value:'machineTmu',text:'机器TMU',dictCode:''})
+        fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''})
+        fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyClothActionFormDetail.showModal(id)
+      }
+    }
+  }
+</script>
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+</style>

ant-design-vue-jeecg/src/views/process/modules/list/ZyFabricList.vue

@@ -0,0 +1,196 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="花样">-->
+<!--              <j-search-select-tag placeholder="请选择花样" v-model="queryParam.pattern" dict="pattern"/>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="编号">
+              <a-input placeholder="编号" v-model="queryParam.fabricNumber"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="名称">
+              <a-input placeholder="名称" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+    </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>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange1}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="imgeSlot" slot-scope="text">
+          <img  :src="text" height="" 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>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+
+      </a-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+
+  import '@assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ZyFabricList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+    },
+    data () {
+      return {
+        description: '面料表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'fabricNumber'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+        ],
+        url: {
+          list: "/fabric/zyFabric/list",
+          delete: "/fabric/zyFabric/delete",
+          deleteBatch: "/fabric/zyFabric/deleteBatch",
+          exportXlsUrl: "/fabric/zyFabric/exportXls",
+          importExcelUrl: "/fabric/zyFabric/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'color',text:'颜色',dictCode:''})
+        fieldList.push({type:'sel_search',value:'pattern',text:'花样',dictTable:'', dictText:'', dictCode:'pattern'})
+        fieldList.push({type:'sel_search',value:'material',text:'材质',dictTable:'', dictText:'', dictCode:'material'})
+        fieldList.push({type:'sel_search',value:'ply',text:'厚度',dictTable:'ply', dictText:'', dictCode:''})
+        fieldList.push({type:'int',value:'money',text:'单价',dictCode:''})
+        fieldList.push({type:'string',value:'imageUrl',text:'图片地址',dictCode:''})
+        fieldList.push({type:'popup',value:'typeId',text:'面料类型id', popup:{code:'zy_fabric_type',field:'id',orgFields:'id',destFields:'content'}})
+        fieldList.push({type:'sel_search',value:'brandId',text:'材料品牌id',dictTable:'brand', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'fabricNumber',text:'材料编号',dictCode:''})
+        fieldList.push({type:'int',value:'unit',text:'1、为m。2：kg,等',dictCode:'unit1,,'})
+        fieldList.push({type:'int',value:'retailPrice',text:'零售价',dictCode:''})
+        fieldList.push({type:'sel_search',value:'density',text:'密度',dictTable:'density', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'clothW',text:'幅宽',dictCode:'clothW,,'})
+        fieldList.push({type:'string',value:'location',text:'所在地区',dictCode:''})
+        fieldList.push({type:'int',value:'status',text:'状态  o 为下架 1为上架   ',dictCode:'fabric_status,,'})
+        fieldList.push({type:'int',value:'fabricGrade',text:'等级',dictCode:'fabric_grade,,'})
+        fieldList.push({type:'string',value:'qRcode',text:'二维码',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+        fieldList.push({type:'sel_depart',value:'supplierInfo',text:'供货商信息'})
+        fieldList.push({type:'string',value:'createTime',text:'创建时间',dictCode:''})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyFabricFormDetailModel.showModal(id)
+        // this.$children[0].showModal(id)
+      }
+    }
+  }
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>

ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue

@@ -0,0 +1,193 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('zy_cloth_action')">导出</a-button>-->
+<!--      &lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--      &lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <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>-->
+<!--        <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>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange1}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+<!--        <span slot="action" slot-scope="text, record">-->
+<!--          <a @click="handleEdit(record)">编辑</a>-->
+
+<!--          <a-divider type="vertical" />-->
+
+<!--                <a @click="handleDetail(record.id)">详情</a>-->
+<!--              <a-divider type="vertical" />-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+
+<!--        </span>-->
+
+      </a-table>
+    </div>
+
+<!--    <zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal>-->
+<!--    <ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>-->
+  </a-card>
+</template>
+
+<script>
+
+  import '@assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ZyClothActionList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+
+    },
+    data () {
+      return {
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        description: 'zy_cloth_action管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'code'
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+       
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/devicetype/zyDevicetype/list1",
+          importExcelUrl: "base/zyClothAction/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'addPeople',text:'添加人',dictCode:''})
+        fieldList.push({type:'int',value:'freq',text:'频率',dictCode:''})
+        fieldList.push({type:'string',value:'descr',text:'描述',dictCode:''})
+        fieldList.push({type:'int',value:'machineTmu',text:'机器TMU',dictCode:''})
+        fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''})
+        fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyClothActionFormDetail.showModal(id)
+      }
+    }
+  }
+</script>
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+</style>

ant-design-vue-jeecg/src/views/process/modules/list/ZyToolList.vue

@@ -0,0 +1,154 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+
+    </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>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange1}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </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;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+      </a-table>
+    </div>
+
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+
+  export default {
+    name: 'ZyToolList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+    },
+    data () {
+      return {
+        description: 'zy_tool管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'nums'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+
+        ],
+        url: {
+          list: "/tool/zyTool/list",
+          delete: "/tool/zyTool/delete",
+          deleteBatch: "/tool/zyTool/deleteBatch",
+          exportXlsUrl: "/tool/zyTool/exportXls",
+          importExcelUrl: "tool/zyTool/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        let ids = "";
+        for (var a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ",";
+        }
+        this.$emit('onChangeRowKey',ids)
+      },
+      add (code) {
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'工具名称'})
+        fieldList.push({type:'string',value:'nums',text:'工具编号'})
+        fieldList.push({type:'string',value:'function',text:'功能'})
+        fieldList.push({type:'string',value:'specs',text:'规格'})
+        fieldList.push({type:'string',value:'scope',text:'适用范围'})
+        fieldList.push({type:'string',value:'workshopSection',text:'责人工段'})
+        fieldList.push({type:'string',value:'status',text:'状态 ( 0 在库、1   在用、2   遗失 、3   损坏、4   报废)'})
+        fieldList.push({type:'string',value:'qrode',text:'二维码'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothActionController.java

@@ -167,5 +167,10 @@ public class ZyClothActionController extends JeecgController<ZyClothAction, IZyC
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ZyClothAction.class);
     }
+	@GetMapping(value = "/sort")
+	 public Result<?> sort(){
+		String s=zyClothActionService.sort();
+		return Result.ok(s.substring(1));
+	}
 
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothActionMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.base.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.demo.base.entity.ZyClothAction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZyClothActionMapper extends BaseMapper<ZyClothAction> {
 
+    @Select("select nums from zy_cloth_action order by nums desc limit 0,1")
+    String sort();
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothActionService.java

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IZyClothActionService extends IService<ZyClothAction> {
 
+    String sort();
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothActionServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.base.service.impl;
 import org.jeecg.modules.demo.base.entity.ZyClothAction;
 import org.jeecg.modules.demo.base.mapper.ZyClothActionMapper;
 import org.jeecg.modules.demo.base.service.IZyClothActionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyClothActionServiceImpl extends ServiceImpl<ZyClothActionMapper, ZyClothAction> implements IZyClothActionService {
 
+    @Autowired
+    ZyClothActionMapper zyClothActionMapper;
+    @Override
+    public String sort() {
+        return zyClothActionMapper.sort();
+    }
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java

@@ -109,13 +109,17 @@ public class ZyProcessAccessoriesController extends JeecgController<ZyProcessAcc
 	@ApiOperation(value="面料表-添加", notes="面料表-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyProcessAccessories zyProcessAccessories) {
+		String[] split = zyProcessAccessories.getAccessoriesId().split(",");
+		for (String k : split) {
+			zyProcessAccessories.setAccessoriesId(k);
 		QueryWrapper s=new QueryWrapper();
 		s.eq("process_id",zyProcessAccessories.getProcessId());
 		s.eq("accessories_id",zyProcessAccessories.getAccessoriesId());
 		int a=zyProcessAccessoriesService.count(s);
-		if(a>=1)
+		if(a==0)
-			return Result.error("已存在本信息");
 		zyProcessAccessoriesService.save(zyProcessAccessories);
+		zyProcessAccessories.setId(null);
+		}
 		return Result.OK("添加成功！");
 	}
 

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java

@@ -108,13 +108,18 @@ public class ZyProcessActionController extends JeecgController<ZyProcessAction,
 	@ApiOperation(value="zy_process_action-添加", notes="zy_process_action-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyProcessAction zyProcessAction) {
+		String[] split = zyProcessAction.getActionId().split(",");
+		for (String k : split) {
+			zyProcessAction.setActionId(k);
 			QueryWrapper s=new QueryWrapper();
 			s.eq("process_id",zyProcessAction.getProcessId());
 			s.eq("action_id",zyProcessAction.getActionId());
 			int a=zyProcessActionService.count(s);
-		if(a>=1)
+			if(a==0)
-			return Result.error("已存在本信息");
 				zyProcessActionService.save(zyProcessAction);
+			zyProcessAction.setId(null);
+		}
+
 		return Result.OK("添加成功！");
 	}
 
@@ -205,5 +210,22 @@ public class ZyProcessActionController extends JeecgController<ZyProcessAction,
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ZyProcessAction.class);
     }
+	 @AutoLog(value = "排序")
+	 @ApiOperation(value="排序", notes="排序")
+	 @GetMapping(value = "/up")
+	 public Result<?> shang(@RequestParam(name="id",required=true) String id) {
+		zyProcessActionService.up(id);
+		return Result.ok("升序成功");
+	 }
+	 @AutoLog(value = "排序")
+	 @ApiOperation(value="排序", notes="排序")
+	 @GetMapping(value = "/down")
+	 public Result<?> xia(@RequestParam(name="id",required=true) String id) {
+		int a=zyProcessActionService.findSort(id);
+		if(a==0)
+			return Result.error("当前已经是最低级别！！！");
+		zyProcessActionService.down(id);
+		 return Result.ok("降序成功");
+	 }
 
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java

@@ -106,13 +106,17 @@ public class ZyProcessFabricController extends JeecgController<ZyProcessFabric,
 	@ApiOperation(value="zy_process_fabric-添加", notes="zy_process_fabric-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyProcessFabric zyProcessFabric) {
+		String[] split = zyProcessFabric.getFabricId().split(",");
+		for (String k : split) {
+			zyProcessFabric.setFabricId(k);
 		QueryWrapper s=new QueryWrapper();
 		s.eq("process_id",zyProcessFabric.getProcessId());
 		s.eq("fabric_id",zyProcessFabric.getFabricId());
 		int a=zyProcessFabricService.count(s);
-		if(a>=1)
+		if(a==0)
-			return Result.error("已存在本信息");
 		zyProcessFabricService.save(zyProcessFabric);
+		zyProcessFabric.setId(null);
+		}
 		return Result.OK("添加成功！");
 	}
 

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java

@@ -105,13 +105,17 @@ public class ZyProcessMachineController extends JeecgController<ZyProcessMachine
 	@ApiOperation(value="zy_process_machine-添加", notes="zy_process_machine-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody ZyProcessMachine zyProcessMachine) {
+		String[] split = zyProcessMachine.getMachineId().split(",");
+		for (String k : split) {
+			zyProcessMachine.setMachineId(k);
 		QueryWrapper s=new QueryWrapper();
 		s.eq("process_id",zyProcessMachine.getProcessId());
 		s.eq("machine_id",zyProcessMachine.getMachineId());
 		int a=zyProcessMachineService.count(s);
-		if(a>=1)
+		if(a==0)
-			return Result.error("已存在本信息");
 		zyProcessMachineService.save(zyProcessMachine);
+		zyProcessMachine.setId(null);
+		}
 		return Result.OK("添加成功！");
 	}
 

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import org.jeecg.modules.demo.base.entity.ZyClothAction;
 import org.jeecg.modules.demo.pro.entity.ZyProcessAction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -25,4 +26,12 @@ public interface ZyProcessActionMapper extends BaseMapper<ZyProcessAction> {
     IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, @Param("p") String s, @Param("m") String t);
     @Select("select * from zy_cloth_action where id in (select action_id from zy_process_action where process_id=#{id}) ")
     List<ZyClothAction> selectByid(String id);
+
+    @Update("UPDATE zy_process_action SET sort_action=sort_action+1 WHERE id=#{id} ")
+    void up(String id);
+    @Update("UPDATE zy_process_action SET sort_action=sort_action-1 WHERE id=#{id} ")
+    void down(String id);
+
+    @Select("select sort_action from zy_process_action where id=#{id} ")
+    int findSort(String id);
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java

@@ -22,4 +22,10 @@ public interface IZyProcessActionService extends IService<ZyProcessAction> {
     IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, String s, String t);
 
     List<ZyClothAction> selectByid(String id);
+
+    void up(String id);
+
+    int findSort(String id);
+
+    void down(String id);
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java

@@ -39,4 +39,19 @@ public class ZyProcessActionServiceImpl extends ServiceImpl<ZyProcessActionMappe
     public List<ZyClothAction> selectByid(String id) {
         return zyProcessActionMapper.selectByid(id);
     }
+
+    @Override
+    public void up(String id) {
+        zyProcessActionMapper.up(id);
+    }
+
+    @Override
+    public int findSort(String id) {
+        return zyProcessActionMapper.findSort(id);
+    }
+
+    @Override
+    public void down(String id) {
+        zyProcessActionMapper.down(id);
+    }
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java

@@ -119,6 +119,18 @@ public class ZyDevicetypeController extends JeecgController<ZyDevicetype, IZyDev
 
 		return Result.OK(pageList);
 	}
+	 @AutoLog(value = "设备类型-分页列表查询")
+	 @ApiOperation(value="设备类型-分页列表查询", notes="设备类型-分页列表查询")
+	 @GetMapping(value = "/list1")
+	 public Result<?> queryPageList1(ZyDevicetype zyDevicetype,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		 QueryWrapper<ZyDevicetype> queryWrapper = QueryGenerator.initQueryWrapper(zyDevicetype, req.getParameterMap());
+		 Page<ZyDevicetype> page = new Page<ZyDevicetype>(pageNo, pageSize);
+		 IPage<ZyDevicetype> pageList = zyDevicetypeService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
 
 
 	 /**

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java

@@ -50,7 +50,6 @@ public class ZyOperationtoolController extends JeecgController<ZyOperationtool,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        //QueryWrapper<ZyOperationtool> queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap());
-       System.out.println("asdadad*********************************************");
        String s=null,t=null;
        if(zyOperationtool.getOperationid()!=null){
            s="%"+zyOperationtool.getOperationid()+"%";
@@ -89,13 +88,17 @@ public class ZyOperationtoolController extends JeecgController<ZyOperationtool,
    @ApiOperation(value="工序工具-添加", notes="工序工具-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody ZyOperationtool zyOperationtool) {
+       String[] split = zyOperationtool.getToolid().split(",");
+       for (String k : split) {
+           zyOperationtool.setToolid(k);
        QueryWrapper s=new QueryWrapper();
        s.eq("operationid",zyOperationtool.getOperationid());
        s.eq("toolid",zyOperationtool.getToolid());
        int a=zyOperationtoolService.count(s);
-       if(a>=1)
+       if(a==0)
-           return Result.error("已存在本信息");
        zyOperationtoolService.save(zyOperationtool);
+       zyOperationtool.setId(null);
+       }
        return Result.OK("添加成功！");
    }
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java

@@ -20,6 +20,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface ZyOperationtoolMapper extends BaseMapper<ZyOperationtool> {
     @Select("<script>select * from zy_operationtool <where><if test=\" p != null\">operationid in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and toolid in (select id from zy_tool_types where name like #{m})</if></where></script>")
     IPage<ZyOperationtool> page(Page<ZyOperationtool> page, @Param("p") String s, @Param("m") String t);
-    @Select("<script>select a.*,b.process_code,c.nums from zy_operationtool as a,zy_process as b,zy_tool as c <where>a.operationid=b.id and a.toolid=c.id and a.operationid =#{p}<if test=\" m != null\"> and toolid in (select id from zy_tool_types where name like #{m})</if></where></script>")
+    @Select("<script>select a.*,b.process_code,c.nums from zy_operationtool as a,zy_process as b,zy_tool as c <where>a.operationid=b.id and a.toolid=c.id and a.operationid =#{p}<if test=\" m != null\"> and toolid in (select id from zy_tool where name like #{m})</if></where></script>")
     IPage<ZyOperationtool> page1(Page<ZyOperationtool> page, @Param("p") String s, @Param("m") String t);
 }