bug

src/views/List/inquire.vue

@@ -731,10 +731,11 @@ export default {
         return;
       }
 
+      //询价单状态为“待报价，已报价
       if (this.multipleSelection[0].i_status == -1) {
         this.$message({
           showClose: true,
-          message: '请勾选待报价和已报价的信息',
+          message: '请勾选待报价，已报价',
           type: 'warning'
         });
         return;
@@ -745,49 +746,50 @@ export default {
       }).then(res => {
         if (res.code === 0) {
           if (res.data.quote_list.length > 0) {
-            if(res.data.quote_list[0].quote_status != 1 || res.data.quote_list[0].quote_status != 7){
+            //价单状态为“待确认，确认中” quote_status=7 待确认 quote_status=1 确认中
+            if (res.data.quote_list[0].quote_status == 1 || res.data.quote_list[0].quote_status == 7) {
+              var data = res.data.quote_list[0];
+              this.title = '修改报价';
+              this.dialogVisible = true;
+              this.isModify = true; //标记修改状态
+
+              this.ruleForm.inquiry_sn = data.inquiry_sn;
+              this.ruleForm.inquiry_id = data.inquiry_id;
+              this.ruleForm.inquiry_items_id = data.inquiry_items_id;
+              this.ruleForm.quote_id = data.id; //编辑的时候需要
+
+              this.ruleForm.goods_name = data.goods_name;//赋值型号
+              this.ruleForm.brand_name = data.brand_name;//赋值品牌
+              this.ruleForm.quote_number = data.quote_number;//报价数量
+              data.price_origin = this.float(data.price_origin);//价格转换
+              this.ruleForm.price_origin = data.price_origin;//价格
+              this.ruleForm.currency = data.currency.toString();//币种
+              this.ruleForm.tax_rate = Number(data.tax_rate) * 100 + '%';//税率
+              this.ruleForm.batch = data.batch;//批次
+              this.ruleForm.delivery_int = data.delivery_info.delivery_int; //货期
+              this.ruleForm.delivery_unit_val = data.delivery_info.delivery_unit_val;//货期单位
+              this.ruleForm.mpq = data.mpq;//最小包装数量
+              this.ruleForm.moq = data.moq;//起订量
+              data.price_other = this.float(data.price_other);//其他费用
+              this.ruleForm.price_other = data.price_other;//其他费用
+              this.ruleForm.remark = data.remark;//备注
+
+              //报价有效期
+              if (data.expire_time == '') {
+                const start = new Date();
+                start.setTime(start.getTime() + 3600 * 1000 * 24 * 2);
+                this.ruleForm.expire_time = start;
+              } else {
+                this.ruleForm.expire_time = data.expire_time;
+              }
+            }else {
               this.$message({
                 showClose: true,
-                message: '请勾选报价单状态为确认中和待确认',
+                message: '请勾选报价单状态为“待确认，确认中',
                 type: 'warning'
               });
               return;
             }
-
-            var data = res.data.quote_list[0];
-            this.title = '修改报价';
-            this.dialogVisible = true;
-            this.isModify = true; //标记修改状态
-
-            this.ruleForm.inquiry_sn = data.inquiry_sn;
-            this.ruleForm.inquiry_id = data.inquiry_id;
-            this.ruleForm.inquiry_items_id = data.inquiry_items_id;
-            this.ruleForm.quote_id = data.id; //编辑的时候需要
-
-            this.ruleForm.goods_name = data.goods_name;//赋值型号
-            this.ruleForm.brand_name = data.brand_name;//赋值品牌
-            this.ruleForm.quote_number = data.quote_number;//报价数量
-            data.price_origin = this.float(data.price_origin);//价格转换
-            this.ruleForm.price_origin = data.price_origin;//价格
-            this.ruleForm.currency = data.currency.toString();//币种
-            this.ruleForm.tax_rate = Number(data.tax_rate) * 100 + '%';//税率
-            this.ruleForm.batch = data.batch;//批次
-            this.ruleForm.delivery_int = data.delivery_info.delivery_int; //货期
-            this.ruleForm.delivery_unit_val = data.delivery_info.delivery_unit_val;//货期单位
-            this.ruleForm.mpq = data.mpq;//最小包装数量
-            this.ruleForm.moq = data.moq;//起订量
-            data.price_other = this.float(data.price_other);//其他费用
-            this.ruleForm.price_other = data.price_other;//其他费用
-            this.ruleForm.remark = data.remark;//备注
-
-            //报价有效期
-            if (data.expire_time == '') {
-              const start = new Date();
-              start.setTime(start.getTime() + 3600 * 1000 * 24 * 2);
-              this.ruleForm.expire_time = start;
-            } else {
-              this.ruleForm.expire_time = data.expire_time;
-            }
           }
 
         } else {