From c7848c4e6867b9a6f9024a9e02dc266dfe3952ce Mon Sep 17 00:00:00 2001
From: YTD <1158283261@qq.com>
Date: Mon, 14 Nov 2022 15:05:30 +0800
Subject: [PATCH] 2022-11-14

---
 .../src/mixins/JeecgListMixin.js               |  4 ++--
 .../src/views/process/ZyProcessList.vue        |  4 ++--
 .../modules/ZyProcessAccessoriesList.vue       | 18 +++++++++---------
 .../process/modules/ZyProcessFabricList.vue    | 10 +++++-----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
index 78ab45f2..89083d94 100644
--- a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
+++ b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
@@ -249,7 +249,7 @@ export const JeecgListMixin = {
     },
     fuliao: function (id) {
       this.$refs.modalForm3.edit(id);
-      this.$refs.modalForm3.title = "工序辅料管理";
+      this.$refs.modalForm3.title = "工序面料管理";
       this.$refs.modalForm3.disableSubmit = false;
     },
     gongju: function (id) {
@@ -259,7 +259,7 @@ export const JeecgListMixin = {
     },
     mianliao: function (id) {
       this.$refs.modalForm5.edit(id);
-      this.$refs.modalForm5.title = "工序面料管理";
+      this.$refs.modalForm5.title = "工序辅料管理";
       this.$refs.modalForm5.disableSubmit = false;
     },
     handleAdd: function () {
diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
index 550e970f..c8833255 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
@@ -98,11 +98,11 @@
             <a-divider type="vertical"/>
            <a @click="shebei(record.id)">设备</a>
             <a-divider type="vertical"/>
-           <a @click="fuliao(record.id)">辅料</a>
+           <a @click="fuliao(record.id)">面料</a>
             <a-divider type="vertical"/>
           <a @click="gongju(record.id)">工具</a>
             <a-divider type="vertical"/>
-          <a @click="mianliao(record.id)">面料</a>
+          <a @click="mianliao(record.id)">辅料</a>
             <a-divider type="vertical"/>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
index ef19b0e4..0a1376c2 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
@@ -5,8 +5,8 @@
       <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-input v-model="queryParam.accessoriesId" placeholder="请输入设备名称"  ></a-input>
+            <a-form-model-item label="辅料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
+              <a-input v-model="queryParam.accessoriesId" placeholder="请输入辅料名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -23,7 +23,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd1(id)" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('面料表')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('辅料表')">导出</a-button>
 <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
 <!--        <a-button type="primary" icon="import">导入</a-button>-->
 <!--      </a-upload>-->
@@ -124,7 +124,7 @@
           xs: { span: 24 },
           sm: { span: 16 },
         },
-        description: '面料表管理页面',
+        description: '辅料表管理页面',
         // 表头
         columns: [
           {
@@ -148,12 +148,12 @@
             dataIndex: 'processId_dictText'
           },
           {
-            title:'面料编号',
+            title:'辅料编号',
             align:"center",
             dataIndex: 'accessoriesId'
           },
           {
-            title:'面料',
+            title:'辅料',
             align:"center",
             dataIndex: 'accessoriesId_dictText'
           },
@@ -172,7 +172,7 @@
           deleteBatch: "/pro/zyProcessAccessories/deleteBatch",
           exportXlsUrl: "/pro/zyProcessAccessories/exportXls",
           importExcelUrl: "pro/zyProcessAccessories/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -190,7 +190,7 @@
       edit (record) {
         this.id = record;
         this.queryParam.processId=this.id;
-        console.log("燕慧森1号")
+        // console.log("燕慧森1号")
         this.loadData();
         this.visible = true;
 
@@ -200,7 +200,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'popup',value:'processId',text:'工序表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
-        fieldList.push({type:'popup',value:'accessoriesId',text:'面料表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
+        fieldList.push({type:'popup',value:'accessoriesId',text:'辅料表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
         this.superFieldList = fieldList
       }
     }
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
index 6467e719..37bd5e22 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
@@ -11,7 +11,7 @@
 <!--          </a-col>-->
           <a-col :sm="5">
             <a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
-              <a-input v-model="queryParam.fabricId" placeholder="请输入辅料名称"  ></a-input>
+              <a-input v-model="queryParam.fabricId" placeholder="请输入面料名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -153,12 +153,12 @@
             dataIndex: 'processId_dictText'
           },
           {
-            title:'辅料编号',
+            title:'面料编号',
             align:"center",
             dataIndex: 'fabricId'
           },
           {
-            title:'辅料',
+            title:'面料',
             align:"center",
             dataIndex: 'fabricId_dictText'
           },
@@ -195,7 +195,7 @@
       edit (record) {
         this.id = record;
         this.queryParam.processId=this.id;
-        console.log("燕慧森1号")
+        // console.log("燕慧森1号")
         this.loadData();
         this.visible = true;
       },
@@ -204,7 +204,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'processId',text:'工序',dictCode:'zy_process,process_name,id'})
-        fieldList.push({type:'string',value:'fabricId',text:'辅料',dictCode:'zy_fabric,name,id'})
+        fieldList.push({type:'string',value:'fabricId',text:'面料',dictCode:'zy_fabric,name,id'})
         this.superFieldList = fieldList
       }
     }