695593266@qq.com 10 luni în urmă
părinte
comite
8020607178

+ 13 - 5
src/api/technology/production/index.js

@@ -53,7 +53,6 @@ export default {
     }
     }
   },
   },
 
 
-
   // 工序质检参数保存
   // 工序质检参数保存
   saveBatch: async (data) => {
   saveBatch: async (data) => {
     const res = await request.post('/main/taskqualityparam/saveBatch', data);
     const res = await request.post('/main/taskqualityparam/saveBatch', data);
@@ -62,6 +61,18 @@ export default {
     }
     }
   },
   },
 
 
+  //批量修改工作中心
+  bacthUpdate: async (data) => {
+    console.log(data, 'data');
+    const res = await request.put(`/main/producetask/batchUpdate`, data);
+
+    console.log(res, 'res');
+    if (res.data.code == 0) {
+      return res.data;
+    }
+
+    return Promise.reject(new Error(res.data.message));
+  },
 
 
   byTaskId: async (taskId) => {
   byTaskId: async (taskId) => {
     const res = await request.get(
     const res = await request.get(
@@ -70,8 +81,5 @@ export default {
     if (res.data.code == 0) {
     if (res.data.code == 0) {
       return res.data.data;
       return res.data.data;
     }
     }
-  },
-
-  
-
+  }
 };
 };

+ 9 - 9
src/utils/request.js

@@ -49,24 +49,23 @@ service.interceptors.response.use(
   (res) => {
   (res) => {
     // token 自动续期
     // token 自动续期
 
 
-console.log(res,'*******************');
-// && res.config?.showErrorToast !== false
+    console.log(res, '*******************');
+    // && res.config?.showErrorToast !== false
     if (Number(res.data.code) == -1) {
     if (Number(res.data.code) == -1) {
       Message.error({
       Message.error({
         dangerouslyUseHTMLString: true,
         dangerouslyUseHTMLString: true,
-        message:res.data.message}
-      );
+        message: res.data.message
+      });
       return res;
       return res;
     }
     }
-    if (Number(res.data.code) == 500 ) {
+    if (Number(res.data.code) == 500) {
       Message.error({
       Message.error({
         dangerouslyUseHTMLString: true,
         dangerouslyUseHTMLString: true,
-        message:res.data.message}
-      );
+        message: res.data.message
+      });
       return res;
       return res;
     }
     }
 
 
-
     const token = res.headers[TOKEN_HEADER_NAME.toLowerCase()];
     const token = res.headers[TOKEN_HEADER_NAME.toLowerCase()];
     if (token) {
     if (token) {
       setToken(token);
       setToken(token);
@@ -75,6 +74,7 @@ console.log(res,'*******************');
     return res;
     return res;
   },
   },
   (error) => {
   (error) => {
+    console.log(error, 'error');
     // 登录过期处理
     // 登录过期处理
     if (error?.response?.status === 401) {
     if (error?.response?.status === 401) {
       const currentPath = router.currentRoute.path;
       const currentPath = router.currentRoute.path;
@@ -94,7 +94,7 @@ console.log(res,'*******************');
         });
         });
       }
       }
       return Promise.reject(new Error(error.response.data?.message));
       return Promise.reject(new Error(error.response.data?.message));
-    }else if(!error?.response?.status){
+    } else if (!error?.response?.status) {
       Message.error('服务调用失败,请联系管理员!');
       Message.error('服务调用失败,请联系管理员!');
     }
     }
     return Promise.reject(error);
     return Promise.reject(error);

+ 17 - 2
src/views/material/BOMmanage/components/detailedList.vue

@@ -129,7 +129,22 @@
       </template>
       </template>
 
 
       <template v-slot:resourceBomVersion="{ row }">
       <template v-slot:resourceBomVersion="{ row }">
-        <div v-if="!row.id">
+        <div>
+          <el-select
+            v-model="row.resourceBomVersion"
+            class="ele-block"
+            size="mini"
+            @change="resourceBomVersionFn($event, row)"
+          >
+            <el-option
+              v-for="item in row.resourceBomVersionList"
+              :key="item.versions"
+              :value="item.versions"
+              :label="'V' + item.versions + '.0'"
+            ></el-option>
+          </el-select>
+        </div>
+        <!-- <div v-if="!row.id">
           <el-select
           <el-select
             v-model="row.resourceBomVersion"
             v-model="row.resourceBomVersion"
             disabled
             disabled
@@ -148,7 +163,7 @@
 
 
         <div v-else-if="row.resourceBomVersion">
         <div v-else-if="row.resourceBomVersion">
           {{ 'V' + row.resourceBomVersion + '.0' }}
           {{ 'V' + row.resourceBomVersion + '.0' }}
-        </div>
+        </div> -->
       </template>
       </template>
 
 
       <template v-slot:materielDesignation="{ row }">
       <template v-slot:materielDesignation="{ row }">

+ 2 - 0
src/views/material/BOMmanage/components/standardOutput.vue

@@ -337,7 +337,9 @@
         if (Array.isArray(list)) {
         if (Array.isArray(list)) {
           this.isshow = true;
           this.isshow = true;
           this.selectList = list;
           this.selectList = list;
+          console.log(this.selectList, 'this.selectList');
         } else {
         } else {
+          console.log('2222');
           this.isshow = false;
           this.isshow = false;
           this.type = list;
           this.type = list;
         }
         }

+ 1 - 1
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -1471,7 +1471,7 @@
 
 
         this.tableData.taskParam[this.currentIndex][type].push({
         this.tableData.taskParam[this.currentIndex][type].push({
           subCode,
           subCode,
-          bomArtFiles: '',
+          bomArtFiles: [],
           categoryId: '',
           categoryId: '',
           categoryName: '',
           categoryName: '',
           isReworkBom: 0,
           isReworkBom: 0,

+ 20 - 1
src/views/technology/production/index.vue

@@ -54,7 +54,6 @@
             type="primary"
             type="primary"
             class="ele-btn-icon"
             class="ele-btn-icon"
             @click="batchUpdateWorkCenter()"
             @click="batchUpdateWorkCenter()"
-            v-if="$hasPermission('main:producetask:save')"
           >
           >
             批量修改工作中心
             批量修改工作中心
           </el-button>
           </el-button>
@@ -359,6 +358,26 @@
       },
       },
 
 
       determineChoose(row) {
       determineChoose(row) {
+        if (row) {
+          this.loading = true;
+          this.selection.forEach((item) => {
+            item.workCenterName = row.name;
+            item.workCenterId = row.id;
+          });
+
+          producetask
+            .bacthUpdate(JSON.parse(JSON.stringify(this.selection)))
+            .then((res) => {
+              if (res.code == 0) {
+                this.$message.success('修改成功');
+              }
+              this.loading = false;
+            })
+            .catch((e) => {
+              this.loading = false;
+            });
+        }
+
         // this.loading = true;
         // this.loading = true;
         // for (let i = 0; i < this.selection.length; i++) {
         // for (let i = 0; i < this.selection.length; i++) {
         //   this.selection[i].workCenterName = row.name;
         //   this.selection[i].workCenterName = row.name;

+ 2 - 2
vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
         // target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.176:18086',
-        // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18186',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域