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

src/api/basic/invRelBusTypes.js

@@ -3,7 +3,7 @@ import axios from "@/utils/request";
 
 export function filterSelectInvUser(query) {
   return axios({
-    url: "/spms/bus/user/select/filter",
+    url: "/spms/bus/user/selectEnable/filter",
     method: "get",
     params: query
   });

src/views/basic/business/stockOrderPrint.vue

@@ -430,7 +430,8 @@ export default {
     },
 
     combine(){
-      if(this.orderQuery==null && this.orderQuery.length==0){
+      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,12 +435,13 @@ export default {
 
         selectExport() {
             var selectData = this.multipleSelection;
+            this.filterQuery.rlIds=[];
             if(selectData.length==0){
               this.$message.error("请先选择产品！");
               return
             }
             selectData.forEach((obj) => {
-                this.filterQuery.rlIds.push(obj.id);
+                 this.filterQuery.rlIds.push(obj.id);
                  this.filterQuery.nameCode=obj.nameCode;
             });
 

src/views/basic/product/udiInfoManageSp.vue

@@ -523,7 +523,7 @@ export default {
         postQuery.ids.push(row.rlId);
       });
       if(postQuery.ids.length<=0){
-        this.$message.error("请先选择供应商！");
+        this.$message.error("请先选择产品！");
         return
       }
       lockStatus(postQuery)

src/views/inout/DialogCreateOrder.vue

@@ -146,7 +146,7 @@
               "
             >
               <el-select
-                v-model="orderFormData.fromCorpName"
+                v-model="orderFormData.fromCorp"
                 filterable
                 remote
                 clearable
@@ -1091,7 +1091,6 @@ export default {
       );
       tQuery.code = this.codeFormData.code;
       tQuery.orderType = this.viewType;
-      debugger
       this.addCodeSubmit(tQuery);
       this.$refs.inputRef.select();
     },
@@ -1130,6 +1129,7 @@ export default {
           this.refreshCodesPanel();
           this.$refs.inputRef.focus();
           this.$refs.inputRef.select();
+          this.orderFormData.relId = null;
         } else {
           if (response.code == 502) {
             //该产品绑定多个产品ID处理

src/views/inout/DialogCreateOrderSelect.vue

@@ -55,6 +55,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="备注:">
+              <el-input
+                  v-model="filterQuery.remark"
+                  placeholder="请输入备注"
+                  style="width: 90%"
+                  clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>

src/views/inout/InvoiceRegByOrder.vue

@@ -185,7 +185,7 @@
             </el-tag>
           </template>
         </el-table-column>
-
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"

src/views/inventory/addInvRemindSetDialog.vue

@@ -145,7 +145,7 @@ export default {
         deptCode: null,
         invCode: null,
         invSpaceCode: null,
-        lowStock: false,
+        lowStock: null,
         lackStock: false,
         overStock: false,
         expireDate: false,
@@ -166,11 +166,21 @@ export default {
       getInfoByInvId({invId: this.invId}).then((res) => {
         if (res.code === 20000) {
           this.formData = res.data;
-          this.formData.lowStock = false;
+          if (res.data.lowStock == null) {
-          this.formData.lackStock = false;
+            this.formData.lowStock = false;
-          this.formData.overStock = false;
+          }
-          this.formData.expireDate = false;
+          if (res.data.lackStock == null) {
-          this.formData.recentDate = false;
+            this.formData.lackStock = false;
+          }
+          if (res.data.overStock == null) {
+            this.formData.overStock = false;
+          }
+          if (res.data.expireDate == null) {
+            this.formData.expireDate = false;
+          }
+          if (res.data.recentDate == null) {
+            this.formData.recentDate = false;
+          }
         } else {
           this.$message.error(res.meesage);
         }

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 = [];

src/views/system/dept/invWarehouse.vue

@@ -163,8 +163,9 @@
                 <treeselect v-model="subData.parentCode" :options="invOptions" :normalizer="normalizer"
                             :disabled="isShow"
                             style="width: 80%"
-                            placeholder="选择上级仓库"/>
+                            placeholder="选择上级仓库">
 
+                </treeselect>
               </el-form-item>
             </el-col>
           </el-row>
@@ -562,7 +563,7 @@ export default {
         this.subData.advanceType = this.subData.advanceType.toString();
         if (this.subData.parentCode != null && this.subData.parentCode != "") {
           this.isAdvanceTypeShow = true;
-          this.isShow = false;
+          this.isShow = true;
         } else {
           this.isAdvanceTypeShow = false;
           this.isShow = true
@@ -578,7 +579,6 @@ export default {
           this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
         }
       }
-        debugger
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
       if (this.subData.parentCode != null && this.subData.parentCode != "") {
@@ -592,7 +592,6 @@ export default {
       }
       filterSubAll(this.query)
         .then((response) => {
-          debugger
           let invList = response.data || [];
           //上级仓库中去除当前仓库节点
           if (invList.length > 0) {