外协人员追溯V3

src/api/Outsourcing/PreorderAssociation.js

@@ -97,7 +97,7 @@ export function edit2(num1, num2, num3) {
   })
 }
 // 保存每行价格
-export function saveRowPrice(num1, price1, num2, price2) {
+export function saveRowPrice(num1, price1, num2, price2, id) {
   return request({
     url: '',
     method: 'post',
@@ -106,7 +106,7 @@ export function saveRowPrice(num1, price1, num2, price2) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理工艺_零件工序_修改数据_序间外协预算价格_系数',
-      param: '工序流水号=' + num1 + '&外协预算价格=' + price1 + '&工艺计划流水号=' + num2 + '&材料费=' + price2
+      param: '工序流水号=' + num1 + '&外协预算价格=' + price1 + '&工艺计划流水号=' + num2 + '&材料费=' + price2 + '&外协分配人员编号=' + id
     }
   })
 }

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -11,7 +11,7 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" prop="零件图号" align="center" min-width="200px" >
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="160px" >
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -31,6 +31,11 @@
             {{ scope.row.外协工序 }}
           </template>
         </el-table-column>
+        <el-table-column label="分配人" align="center" show-overflow-tooltip width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.外协分配人 }}
+          </template>
+        </el-table-column>
       </el-table>
     </el-card>
     <el-card>

src/views/Outsourcing/PreorderAssociation/index.vue

@@ -288,7 +288,8 @@ export default {
         if (this.count !== this.tableData2.length) {
           this.a = 0
           for (let i = 0; i < this.tableData2.length; i++) {
-            saveRowPrice(this.tableData2[i].工序流水号, 0, this.tableData2[i].工艺计划流水号, 0).then(response => {
+            console.log(this.$store.state.user.id, 9090)
+            saveRowPrice(this.tableData2[i].工序流水号, 0, this.tableData2[i].工艺计划流水号, 0, this.$store.state.user.id).then(response => {
               this.a += parseInt(response.data[0].result)
               if (this.a === this.tableData2.length) {
                 this.$message.success('保存成功')

src/views/layout/components/Navbar.vue

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <div>
     <el-menu class="navbar" mode="horizontal" style="background: rgb(87,177,253)!important;">
@@ -36,6 +37,7 @@ import { RequestFund, setChakan2 } from '@/api/PurchasingCenter/PurchaseContract
 import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
 import { searchTable } from '@/api/PurchasingCenter/PurchaseMaterielModify'
 import { search } from '@/api/Assembly/DeliveryConfirmation'
+import Cookies from 'js-cookie'
 export default {
   components: {
     Breadcrumb,
@@ -69,7 +71,8 @@ export default {
     ])
   },
   mounted() {
-    if (this.id.toString() === '3') {
+    console.log(Cookies.get('id'), 999)
+    if (this.id === 3 || Cookies.get('id') === 3) {
       this.checkApproval()
       this.timer = setInterval(this.checkApproval, 1000 * 60 * 5)
     } else if (this.token.toString() === '11' || this.token.toString() === '12') {