Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue

@@ -223,6 +223,7 @@ export default {
       title: '',
       tableKey: 0,
       list: [],
+      price_list: [],
       listLoading: false,
       listQuery: {
         params: {
@@ -471,11 +472,6 @@ export default {
         }
       })
     },
-    // 打开价格维护
-    handleJiage(row) {
-      this.pageState = 2
-      this.$refs['weihu'].showWeiHu(row.sid)
-    },
     handleBiaoQian(row) {
       this.pageState = 4
       this.$refs['biaoqian'].showEdit(row.sid, this.listQuery.params.useOrgSid)
@@ -483,8 +479,12 @@ export default {
     // 价格维护
     toPreserve() {
       if (this.sids.length === 1) {
-        this.pageState = 2
+        if (this.price_list[0].guidedPrice !== '' && this.price_list[0].manufactorSettlementPrice !== '') {
-        this.$refs['weihu'].showWeiHu(this.sids[0])
+          this.$message({ showClose: true, type: 'error', message: '价格已维护，无需重复维护' })
+        } else {
+          this.pageState = 2
+          this.$refs['weihu'].showWeiHu(this.sids[0])
+        }
       } else {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行价格维护操作' })
         return
@@ -531,6 +531,7 @@ export default {
     handleSelectionChange(row) {
       const aa = []
       const bb = []
+      const cc = []
       row.forEach((element) => {
         aa.push(element.sid)
         bb.push({
@@ -539,7 +540,12 @@ export default {
           userSid: window.sessionStorage.getItem('userSid'),
           orgPath: window.sessionStorage.getItem('defaultOrgPath')
         })
+        cc.push({
+          guidedPrice: element.guidedPrice,
+          manufactorSettlementPrice: element.manufactorSettlementPrice
+        })
       })
+      this.price_list = cc
       this.sids = aa
       this.configurationItemsSid_list = bb
       console.log('选择的数据', this.sids)