Merge remote-tracking branch 'origin/dev' into dev

.env.development

@@ -4,7 +4,6 @@ VUE_APP_TITLE = 供应商自助管理平台
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
 VUE_APP_BASE_API = 'http://192.168.0.166:9993'
 
 # 应用访问路径 例如使用前缀 /admin/

.env.production

@@ -14,10 +14,10 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
-# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
 # 文明懂
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
 
 # 林淑波
 # VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_SPMS_SERVER/'

src/views/inout/DialogcChangeNewOrder.vue

@@ -260,29 +260,27 @@ export default {
         this.$message.warning("请选择单据类型！");
         return;
       }
-      if ((this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) && this.$isBlank(this.formData.fromCorp)) {
-        this.$message.error('当前往来信息不能为空');
-        return;
-      }
       if (this.$isBlank(this.formData.invCode)) {
         this.$message.error("当前分库不能为空");
         return;
       }
-
-      if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit && this.$isBlank(this.formData.fromCorp))) {
+      if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) {
+        this.$message.error('往来单位不能为空');
+        return;
+      }
+      if ((this.curAction.corpType === 2 && this.$isBlank(this.formData.fromCorp))) {
         this.$message.error("往来单位不能为空");
         return;
       }
-
-      if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) {
+      if ((this.curAction.corpType === 4 && this.$isBlank(this.formData.fromCorp))) {
         this.$message.error("往来单位不能为空");
         return;
       }
-
-      if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) {
-        this.$message.error('往来单位不能为空');
+      if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) {
+        this.$message.error("往来单位不能为空");
         return;
       }
+
       if (this.detailList.length == 0) {
         this.$message.error("产品列表不能为空");
         return;

src/views/inout/InvoiceRegCkeck.vue

@@ -314,7 +314,6 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
-        invCode: this.$store.getters.locInvCode
       },
 
       corpLoading: false,
@@ -601,6 +600,7 @@ export default {
     },
 
     getCodeDetailLists() {
+      debugger
       this.filterQuery.invoiceEncode = this.inputQuery.invoiceEncode
       this.filterQuery.vueType = 'supInvoice'
       this.codeDetailLoading = true
@@ -713,22 +713,26 @@ export default {
         this.$message.error('发票编码不能为空！')
         return
       }
-      //查询发票编码有没有重复
-      checkInvoiceCode({invoiceEncode:this.inputQuery.invoiceEncode})
-        .then((response) => {
-          if (response.code === 20000) {
-            this.invoiceSelectRegByOrderVisible = true
-          } else {
+      if(this.list.length==0){
+        //查询发票编码有没有重复
+        checkInvoiceCode({invoiceEncode:this.inputQuery.invoiceEncode})
+          .then((response) => {
+            if (response.code === 20000) {
+              this.invoiceSelectRegByOrderVisible = true
+            } else {
+              this.$message.error(response.message)
+            }
+          })
+          .catch((response) => {
             this.$message.error(response.message)
-          }
-        })
-        .catch((response) => {
-          this.$message.error(response.message)
-        })
+          })
+      }else{
+        this.invoiceSelectRegByOrderVisible = true
+      }
     },
     closeAcceptDialog(){
       this.invoiceSelectRegByOrderVisible = false
-       this.getCodeDetailLists()
+      this.getCodeDetailLists()
     },
     delectSub(row){
       deleteInvoiceByOrderFk({billNo:row.billNo,invoiceEncode:this.inputQuery.invoiceEncode})
@@ -787,7 +791,7 @@ export default {
     }
     if(this.curInvoice.id!=null){
       this.inputQuery=this.curInvoice
-       this.getOrderDetail();
+      this.getOrderDetail();
     }
   }
 }

src/views/purchase/cert/supCertSet.vue

@@ -309,11 +309,11 @@
 
                     <el-row>
                         <el-col :span="11">
-                            <el-form-item label="产地：" prop="require">
+                            <el-form-item label="产地：" prop="imports">
                                 <el-select v-model="currentProduct.imports" style="width: 90%">
-                                    <el-option label="全部" value="1"></el-option>
-                                    <el-option label="国外" value="2"></el-option>
-                                    <el-option label="国内" value="3"></el-option>
+                                    <el-option label="全部" :value="1"></el-option>
+                                    <el-option label="国外" :value="2"></el-option>
+                                    <el-option label="国内" :value="3"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>

src/views/supplier/company/basicProductEdit.vue

@@ -866,7 +866,6 @@ export default {
     },
 
     methods: {
-
         onAddSubmit() {
             this.relevanceEdit.isDisable = this.editQuery.isDisable;
             this.relevanceEdit.isLock = this.editQuery.isLock;