فهرست منبع

bugfix: 178/179/181

chrislee 1 سال پیش
والد
کامیت
8891c791da

+ 17 - 18
src/views/modules/cus/quoted.vue

@@ -191,7 +191,7 @@
           fixed="right"
           header-align="center"
           align="center"
-          min-width="140"
+          min-width="120"
           :show-tooltip-when-overflow="true"
           label="项目状态"
         >
@@ -204,7 +204,7 @@
           fixed="right"
           header-align="center"
           align="center"
-          min-width="140"
+          min-width="120"
           :show-tooltip-when-overflow="true"
           label="项目评估状态"
         >
@@ -216,8 +216,7 @@
           fixed="right"
           header-align="center"
           align="center"
-          min-width="340"
-          width="340"
+          min-width="180"
           label="操作"
         >
           <template slot-scope="scope">
@@ -228,67 +227,67 @@
               >查看</el-button
             >
             <el-button
-              v-if="isAuth('quoted:price:update')"
+              v-if="isAuth('quoted:price:update') && Number(scope.row.approveState) === 0"
               type="text"
               size="small"
               @click="addOrUpdateHandle(scope.row.priceId)"
               >编辑</el-button
             >
             <el-button
-              v-if="isAuth('quoted:price:revoke')"
+              v-if="isAuth('quoted:price:revoke') && Number(scope.row.approveState) === 1"
               type="text"
               size="small"
               @click="revokeHandle(scope.row.priceId)"
               >撤回</el-button
             >
             <el-button
-              v-if="isAuth('quoted:price:updateFirst')"
+              v-if="isAuth('quoted:price:updateFirst') && Number(scope.row.approveState) === 3 && Number(scope.row.state) < 3"
               type="text"
               size="small"
               @click="priceHandle(scope.row.priceId,'first')"
               >报价</el-button
             >
             <el-button
-              v-if="isAuth('quoted:price:updateTwo')"
+              v-if="isAuth('quoted:price:updateTwo') && Number(scope.row.approveState) === 3 && Number(scope.row.state) < 3"
               type="text"
               size="small"
               @click="priceHandle(scope.row.priceId,'second')"
               >精准报价</el-button
             >
             <el-button
-              v-if="isAuth('work:clt:insertBatch')"
+              v-if="isAuth('work:clt:insertBatch') && Number(scope.row.approveState) === 3 && Number(scope.row.state) > 6"
               type="text"
               size="small"
               @click="notifyHandle(scope.row.priceId)"
               >通知报价</el-button
             >
             <el-button
-              v-if="isAuth('quoted:price:updateRestart')"
+              v-if="isAuth('quoted:price:updateRestart') && Number(scope.row.approveState) === 3 && Number(scope.row.state) > 6"
               type="text"
               size="small"
               @click="priceHandle(scope.row.priceId, 'restart')"
               >重新报价</el-button
             >
             <el-button
-              v-if="isAuth('quoted:price:updateAccredit')"
+              v-if="isAuth('quoted:price:updateAccredit') && Number(scope.row.approveState) === 3 && (Number(scope.row.state) === 3 || Number(scope.row.state) === 4)"
               type="text"
               size="small"
               @click="accreditHandle(scope.row.priceId)"
               >授权</el-button
             >
             <el-button
-              v-if="isAuth('quoted:price:updateResult')"
+              v-if="isAuth('quoted:price:updateResult') && Number(scope.row.approveState) === 3 && (Number(scope.row.state) === 3 || Number(scope.row.state) === 4)"
               type="text"
               size="small"
               @click="resultHandle(scope.row.priceId)"
               >报价结果</el-button
             >
-            <el-button
-              type="text"
-              size="small"
-              @click="showDetail"
-              >导出</el-button
-            >
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              @click="showDetail"-->
+<!--              >导出</el-button-->
+<!--            >-->
           </template>
         </el-table-column>
       </el-table>

+ 3 - 0
src/views/modules/order/dispatch-detail.vue

@@ -62,6 +62,9 @@ export default {
             nodeList: data.data.nodeList,
             lineList: data.data.lineList
           }
+        } else {
+          this.$message.error(data.msg)
+          this.onChose()
         }
       })
     }

+ 4 - 1
src/views/modules/production/monitoring-details.vue

@@ -85,7 +85,6 @@ export default {
     },
     // 初始化表单
     async init (id, prodCode, disable) {
-      this.visible = true
       this.display = disable
       this.nodeList = []
       this.linkList = []
@@ -94,6 +93,7 @@ export default {
 
       await getMonitoringDetail(id).then(async ({ data }) => {
         if (data && data.code === '200') {
+          this.visible = true
           this.dataForm = {
             ...this.dataForm
           }
@@ -102,6 +102,9 @@ export default {
             nodeList: data.data.nodeList,
             lineList: data.data.lineList
           }
+        } else {
+          this.$message.error(data.msg)
+          this.handleClose()
         }
       })
     },

+ 3 - 0
src/views/modules/production/recording-details.vue

@@ -82,6 +82,9 @@ export default {
             nodeList: data.data.nodeList,
             lineList: data.data.lineList
           }
+        } else {
+          this.$message.error(data.msg)
+          this.handleClose()
         }
       })
     },