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

src/views/basic/business/stockOrderPrint.vue

@@ -430,7 +430,9 @@ export default {
     },
 
     combine(){
-      if(this.orderQuery==null && this.orderQuery.length==0){
+      debugger
+      console.log(this.orderQuery)
+      if(this.orderQuery==null || this.orderQuery.length==0){
         this.$message.error("请先选择单据！")
         return;
       }

src/views/basic/corpMaintain/corpMaintain.vue

@@ -14,7 +14,8 @@
                 <el-option label="全部" value=""></el-option>
                 <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="3"></el-option>
+<!--                <el-option label="特殊科室" value="3"></el-option>-->
                 <el-option label="特殊往来" value="4"></el-option>
               </el-select>
             </el-form-item>
@@ -259,7 +260,8 @@ export default {
         },
         {
           value: 3,
-          label: "特殊科室"
+          // label: "特殊科室"
+          label: "内部科室"
         },
         {
           value: 4,

src/views/basic/product/basicCompanyProductsImport.vue

@@ -435,6 +435,7 @@ export default {
 
         selectExport() {
             var selectData = this.multipleSelection;
+            this.filterQuery.rlIds=[];
             if(selectData.length==0){
               this.$message.error("请先选择产品！");
               return

src/views/purchase/purOrder/purOrderEditDialog.vue

@@ -452,6 +452,7 @@ export default {
     },
     tableCountChange(row) {
       if (this.$isNotBlank(row)) {
+        this.currentRow.supId = row.supName;
         updateDetail(this.currentRow);
       }
     },

src/views/remind/invRemindMsg.vue

@@ -361,6 +361,7 @@ export default {
         limit: 20,
         listInv:this.invCodeList,
       };
+      this.queryName = null;
       this.getList();
       this.spaceList = [];
       this.ggxhList = [];