修改bug

src/store/modules/user.js

@@ -4,8 +4,8 @@
 import { formatMenus, toTreeData, formatTreeData } from 'ele-admin';
 import { USER_MENUS } from '@/config/setting';
 import { getResourcesTree } from '@/api/layout';
-import {getCurrentUserAuthorityDeptAPI} from "@/api/login";
-import { getCurrentUser,setCurrentUser } from '@/utils/token-util';
+import { getCurrentUserAuthorityDeptAPI } from '@/api/login';
+import { getCurrentUser, setCurrentUser } from '@/utils/token-util';
 
 const formatRouter = (list) => {
   let menuList = []; // menuType
@@ -52,7 +52,7 @@ export default {
     authoritiesRouter: [],
     // 当前登录用户的角色
     roles: [],
-    currentObj:{},
+    currentObj: {},
     taskObj: {}, //工序对象
     // 当前登录用户的数据权限部门数据
     authorityDept: {}
@@ -128,8 +128,11 @@ export default {
     // },
     //动态路由
     async fetchUserInfo({ commit }) {
-      let currentUser = getCurrentUser()
-      const result = await getResourcesTree({groupId:currentUser.currentGroupId,roleId:currentUser.currentRoleId}).catch(() => {});
+      let currentUser = getCurrentUser();
+      const result = await getResourcesTree({
+        groupId: currentUser.currentGroupId,
+        roleId: currentUser.currentRoleId
+      }).catch(() => {});
       const list = result.filter((i) => i.path === '/page-mes');
       if (!list.length) {
         return {};
@@ -150,20 +153,20 @@ export default {
       // 用户菜单, 过滤掉按钮类型并转为 children 形式
       const { menus, homePath } = formatMenus(
         USER_MENUS ??
-        toTreeData({
-          data: menuList,
-          idField: 'id',
-          parentIdField: 'parentId'
-        })
+          toTreeData({
+            data: menuList,
+            idField: 'id',
+            parentIdField: 'parentId'
+          })
       );
       // 用户路由按钮
       const { menus: authoritiesRouter } = formatMenus(
         USER_MENUS ??
-        toTreeData({
-          data: authorities.filter((i) => i.path),
-          idField: 'id',
-          parentIdField: 'parentId'
-        })
+          toTreeData({
+            data: authorities.filter((i) => i.path),
+            idField: 'id',
+            parentIdField: 'parentId'
+          })
       );
       console.log('menus--', menus);
       commit('setMenus', menus);
@@ -210,6 +213,6 @@ export default {
     },
     setTaskObj({ commit }, value) {
       commit('setTaskObj', value);
-    },
+    }
   }
 };

src/views/pick/pickApply/components/pick-search.vue

@@ -34,7 +34,12 @@
         v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
       >
         <el-form-item label="状态:">
-          <el-select size="mini" v-model="where.status" style="width: 100%">
+          <el-select
+            size="mini"
+            v-model="where.status"
+            style="width: 100%"
+            clearable
+          >
             <el-option
               v-for="item in statusList"
               :key="item.value"
@@ -101,6 +106,10 @@
           {
             value: '2',
             label: '已出库'
+          },
+          {
+            value: '3',
+            label: '已驳回'
           }
         ]
       };

src/views/pick/pickApply/index.vue

@@ -40,7 +40,7 @@
 
         <template v-slot:status="{ row }">
           <el-tag
-            :type="['danger', 'success', 'warning', 'danger'][row.status]"
+            :type="['info', 'success', 'warning', 'danger'][row.status]"
             effect="dark"
             >{{ statusList[row.status] }}</el-tag
           >

src/views/produce/components/jobBooking/components/jobBom.vue

@@ -536,7 +536,6 @@
         });
       },
       singleQuery() {
-        console.log(this.item.workReportInfo);
         if (!this.item.workReportInfo.formedNum)
           return this.$message.info('请输入合格品数');
 

src/views/produce/components/jobBooking/components/semiProductJobBomPL.vue

@@ -474,6 +474,7 @@
             class="content_num"
             v-model="row.feedQuantity"
             placeholder="数量"
+            :disabled="isDetails"
           />
         </template>
       </el-table-column>
@@ -826,6 +827,7 @@
       },
 
       changeHeatNumber() {
+        console.log(this.list, 'PLList1111');
         this.deviceList.forEach((f) => {
           this.list.forEach((o, index) => {
             //  o.deviceId &&

src/views/produce/components/jobBooking/details.vue

@@ -96,7 +96,10 @@
           <!-- //单件报工 -->
           <semiProductJobBom
             v-if="
-              objData.semiProductList && objData.semiProductList.length != 0
+              objData.semiProductList &&
+              objData.semiProductList.length != 0 &&
+              objData.singleReport == 1 &&
+              clientEnvironmentId != 3
             "
             :list="objData.semiProductList"
             :item="objData"
@@ -112,7 +115,8 @@
             v-if="
               objData.product &&
               objData.product.length != 0 &&
-              clientEnvironmentId != 3
+              clientEnvironmentId != 3 &&
+              objData.singleReport == 0
             "
             :list="objData.product"
             :item="objData"
@@ -123,12 +127,20 @@
           </batchSemiProductJobBom>
 
           <!-- 批量报工 -->
-          <!-- <semiProductJobBomPL v-if="
-            objData.semiProductList &&
-            (objData.semiProductList.length != 0) &&
-            objData.singleReport == 0 && !(taskType == 6 && clientEnvironmentId == 3)
-          " :list="objData.semiProductList" :item="objData" :equipmentList="objData.equipmentList" :isDetails="true" :singleReport="objData.singleReport">
-          </semiProductJobBomPL> -->
+          <semiProductJobBomPL
+            v-if="
+              objData.semiProductList &&
+              objData.semiProductList.length != 0 &&
+              objData.singleReport == 0 &&
+              !(taskType == 6 && clientEnvironmentId == 3)
+            "
+            :list="objData.semiProductList"
+            :item="objData"
+            :equipmentList="objData.equipmentList"
+            :isDetails="true"
+            :singleReport="objData.singleReport"
+          >
+          </semiProductJobBomPL>
 
           <!-- <oneJobQualityBom v-if="
             objData.semiProductList &&

vue.config.js

@@ -35,13 +35,13 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.33:18086',
-        // target: 'http://192.168.1.251:18186',
+        target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {