Преглед на файлове

bug fix: 172,174,177,180

chris преди 2 години
родител
ревизия
9859670cd0

+ 9 - 0
src/views/modules/cus/quoted.vue

@@ -186,6 +186,15 @@
           label="部门"
         >
         </el-table-column>
+        <el-table-column
+          prop="accredit"
+          header-align="center"
+          align="center"
+          min-width="160"
+          :show-tooltip-when-overflow="true"
+          label="授权情况"
+        >
+        </el-table-column>
         <el-table-column
           prop="state"
           fixed="right"

+ 3 - 0
src/views/modules/doc/doc-list.vue

@@ -149,6 +149,9 @@
           },
           {
             code: '3', value: '工艺文件'
+          },
+          {
+            code: '4', value: '标准表格'
           }
         ]
       }

+ 43 - 16
src/views/modules/production/monitoring.vue

@@ -26,7 +26,7 @@
           align="center">
         </el-table-column>
         <el-table-column
-          prop="prodCode"
+          prop="productNumber"
           header-align="center"
           align="center"
           min-width="100"
@@ -52,7 +52,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="contactDate"
+          prop="deliveryDate"
           header-align="center"
           align="center"
           min-width="160"
@@ -62,16 +62,16 @@
           prop="warningState"
           header-align="center"
           align="center"
-          min-width="160"
-          label="状态">
+          min-width="60"
+          label="预警状态">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.warningState == '1'">正常</el-tag>
-            <el-tag type="warning" v-if="scope.row.warningState == '2'">预警</el-tag>
-            <el-tag type="danger" v-if="scope.row.warningState == '3'">超期</el-tag>
+            <el-tag v-if="Number(scope.row.warningState) === 1">正常</el-tag>
+            <el-tag type="warning" v-if="Number(scope.row.warningState) === 2">预警</el-tag>
+            <el-tag type="danger" v-if="Number(scope.row.warningState) === 3">超期</el-tag>
           </template>
         </el-table-column>
         <el-table-column
-          prop="orderCode"
+          prop="contractNumber"
           header-align="center"
           align="center"
           min-width="120"
@@ -88,9 +88,17 @@
         </el-table-column>
         <el-table-column
           fixed="right"
+          prop="state"
           header-align="center"
           align="center"
-          width="150"
+          :formatter="formatState"
+          label="状态">
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="80"
           label="操作">
           <template slot-scope="scope">
             <el-button v-if="isAuth('prod:monitoring:info')" type="text" size="small" @click="detail(scope.row.id, scope.row.prodCode, true)">查看</el-button>
@@ -128,19 +136,33 @@
         totalPage: 0,
         dataListLoading: false,
         dataListSelections: [],
-        // 状态:1:待排产,2:生产中,3:生产完成
+        // // 状态:1:待排产,2:生产中,3:生产完成
+        // optionsState: [
+        //   {
+        //     code: '1',
+        //     value: '待排产'
+        //   },
+        //   {
+        //     code: '2',
+        //     value: '生产中'
+        //   },
+        //   {
+        //     code: '3',
+        //     value: '生产完成'
+        //   }
+        // ],
         optionsState: [
           {
-            code: '1',
-            value: '待排产'
+            code: '1', value: '待核料'
           },
           {
-            code: '2',
-            value: '生产中'
+            code: '2', value: '采购'
           },
           {
-            code: '3',
-            value: '生产完成'
+            code: '3', value: '委外'
+          },
+          {
+            code: '4', value: '生产'
           }
         ]
       }
@@ -205,6 +227,11 @@
       },
       closeDialogEvent () {
         this.detailsVisible = false
+      },
+      formatState (row) {
+        if (!row.state) return ''
+        const item1 = this.optionsState.find((item) => item.code === row.state.toString())
+        return item1 ? item1.value : ''
       }
     }
   }

+ 3 - 3
src/views/modules/quality/disqualification.vue

@@ -321,21 +321,21 @@
         >
           <template slot-scope="scope">
             <el-button
-              v-if="isAuth('disqualification:invoices:update')"
+              v-if="isAuth('disqualification:invoices:update') && Number(scope.row.state) === 1"
               type="text"
               size="small"
               @click="updateHandle(scope.row)"
               >编辑</el-button
             >
             <el-button
-              v-if="isAuth('disqualification:invoices:updateDispose')"
+              v-if="isAuth('disqualification:invoices:updateDispose') && Number(scope.row.state) === 1"
               type="text"
               size="small"
               @click="disposeHandle(scope.row)"
               >处理</el-button
             >
             <el-button
-              v-if="isAuth('disqualification:invoices:updateVerify')"
+              v-if="isAuth('disqualification:invoices:updateVerify') && Number(scope.row.state) === 2"
               type="text"
               size="small"
               @click="verifyHandle(scope.row)"