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

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 

.env.production

@@ -37,7 +37,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
 
 # 片仔癀诊断
-# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
+ VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/

src/views/inout/DialogEditCode.vue

@@ -18,7 +18,7 @@
             <el-input v-model="editData.produceDate" auto-complete="off"
                       oninput="if(value.length>6)value=value.slice(0,6)"
                       type="number"
-                      :disabled="editType!=1"></el-input>
+                      :disabled="editType!=1 || editData.produceDate!=null"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="11">
@@ -26,19 +26,19 @@
             <el-input v-model="editData.expireDate" auto-complete="off"
                       oninput="if(value.length>6)value=value.slice(0,6)"
                       type="number"
-                      :disabled="editType!=1"></el-input>
+                      :disabled="editType!=1 || editData.expireDate!=null"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="11">
           <el-form-item prop="batchNo" label="批次号">
-            <el-input v-model="editData.batchNo" auto-complete="off" :disabled="editType!=1"></el-input>
+            <el-input v-model="editData.batchNo" auto-complete="off" :disabled="editType!=1 || editData.batchNo!=null"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="11">
           <el-form-item prop="serialNo" label="序列号">
-            <el-input v-model="editData.serialNo" auto-complete="off" :disabled="editType!=1"></el-input>
+            <el-input v-model="editData.serialNo" auto-complete="off" :disabled="editType!=1 || editData.serialNo!=null"></el-input>
           </el-form-item>
         </el-col>
       </el-row>

src/views/inout/DialogSelectProduct.vue

@@ -140,7 +140,10 @@
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
-            <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -170,6 +173,7 @@
 import {addBizProduct} from "@/api/inout/orderDetailCode";
 import {filterCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
 import udiRlDetailDialog from "../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",//选入耗材字典产品对话框
@@ -282,7 +286,7 @@ export default {
         return;
       }
       let str = this.currentRow.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;

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/InvoiceRegByOrder.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号"
+              <el-input v-model="filterQuery.billNo" placeholder="请输入单号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -102,7 +102,13 @@
               </el-date-picker>
             </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.unionRemark" placeholder="请输入备注" style="width: 90%" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -169,6 +175,7 @@
         </el-table-column>
         <el-table-column label="总金额" prop="allAmount" width="120">
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
@@ -185,7 +192,6 @@
             </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"
@@ -558,6 +564,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: null,
+        unionRemark: null,
       },
       determineVisible: false,
       determineData: null,

src/views/inout/InvoiceSelectRegByOrder.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号"
+              <el-input v-model="filterQuery.billNo" placeholder="请输入单号"
                         style="width: 90%"
                         clearable="true"
               ></el-input>
@@ -48,29 +48,12 @@
         </el-row>
         <el-row>
 
-          <el-col :span="8" v-if="showSup">
-            <el-form-item class="query-form-item" label="送货单位:">
-              <el-select
-                v-model="filterQuery.fromCorp"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="送货单位"
-                :remote-method="findMethod"
-                size="mini"
-                :loading="corpLoading"
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="备注:">
+              <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注"
                         style="width: 90%"
-              >
-                <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
+                        clearable="true"
+              ></el-input>
             </el-form-item>
           </el-col>
 
@@ -108,6 +91,33 @@
           </el-col>
 
         </el-row>
+        <el-row>
+          <el-col :span="8" v-if="showSup">
+            <el-form-item class="query-form-item" label="送货单位:">
+              <el-select
+                  v-model="filterQuery.fromCorp"
+                  filterable
+                  remote
+                  clearable="true"
+                  reserve-keyword
+                  placeholder="送货单位"
+                  :remote-method="findMethod"
+                  size="mini"
+                  :loading="corpLoading"
+                  style="width: 90%"
+              >
+                <el-option
+                    v-for="item in fromOptions"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
@@ -143,6 +153,7 @@
         </el-table-column>
         <el-table-column label="总金额" prop="allAmount" width="120">
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
@@ -399,7 +410,8 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
-        invCode: null
+        invCode: null,
+        unionRemark: null
       },
       determineVisible: false,
       determineData: null,

src/views/inventory/InvCheckPlace.vue

@@ -226,6 +226,7 @@ export default {
         limit: 20,
       };
       this.getList();
+      this.invChange();
     },
     onSubmit() {
       this.filterQuery.page = 1;

src/views/inventory/InvOutPlace.vue

@@ -208,6 +208,7 @@ export default {
         limit: 20,
       };
       this.getList();
+      this.invChange();
     },
     onSubmit() {
       this.filterQuery.page = 1;

src/views/inventory/InvPlace.vue

@@ -238,6 +238,7 @@ export default {
         limit: 20,
       };
       this.getList();
+      this.invChange();
     },
     onSubmit() {
       this.filterQuery.page = 1;

src/views/purchase/purOrder/purOrderAudit.vue

@@ -182,8 +182,8 @@ export default {
       formName: null,
       invCodebe: null,
       formMap: {
-        add: "新增采购计划",
-        update: "采购计划审核",
+        add: "新增采购订单",
+        update: "采购订单审核",
       },
       statusMap: {
         1: "草稿",

src/views/purchase/purOrder/purOrderDetailDialog.vue

@@ -261,9 +261,9 @@ export default {
     saveOrder(status) {
       let tip = "";
       if (status == "3") {
-        tip = "是否确定通过该采购计划？";
+        tip = "是否确定通过该采购订单？";
       } else {
-        tip = "是否确定拒绝该采购计划？";
+        tip = "是否确定拒绝该采购订单？";
       }
       this.$confirm(tip, "提示", {
         confirmButtonText: "确定",

src/views/purchase/purOrder/purOrderEditDialog.vue

@@ -398,10 +398,6 @@ export default {
         })
     },
     selectProductFunction() {
-      if (this.$isBlank(this.formData.supId)) {
-        this.$message.warning("请先选择供应商！");
-        return;
-      }
       this.selectProductVisible = true;
       //当父id为空的时候生成id
       if (this.pId == null) {
@@ -428,9 +424,6 @@ export default {
         .then((response) => {
           this.codeArray = response.data.list || [];
           this.total = response.data.total || 0;
-          if (this.total > 0) {
-            this.corpOrderIdDisabled = true;
-          }
           this.loading = false;
         })
         .catch(() => {
@@ -594,7 +587,6 @@ export default {
       this.sValue = this.formData.corpName;
       this.findMethod(this.formData.supId);
       this.getStockOrderDetailList();
-      this.corpOrderIdDisabled = true;
     } else {
       var date = new Date();
       this.formData = {

src/views/purchase/purOrder/purOrderOrderSelectProduct.vue

@@ -142,7 +142,10 @@
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
-                        <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -159,6 +162,7 @@
 import {getStockOrderDetailInstrumentById, stockOrderDetailFilterProduct} from "../../../api/inout/stockOrder";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -348,7 +352,7 @@ export default {
       }
 
       let str = this.multipleSelection.zczbhhzbapzbh;
-            if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;

src/views/purchase/purOrder/purOrderSelectProduct.vue

@@ -137,6 +137,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan
 import store from "../../../store";
 import {addOrderDetail} from "@/api/purchase/purOrder"
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -339,7 +340,7 @@ export default {
         }
       }
       let str = this.multipleSelection.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;

src/views/purchase/purPlan/purOrderSelectProduct.vue

@@ -122,6 +122,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan
 import store from "../../../store";
 import {addPlanDetail} from "@/api/purchase/purPlan"
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -314,7 +315,7 @@ export default {
         }
       }
       let str = this.multipleSelection.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;

src/views/purchase/purPlan/purPlanOrderSelectProduct.vue

@@ -142,7 +142,10 @@
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
-                        <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -160,6 +163,7 @@ import {getStockOrderDetailInstrumentById, stockOrderDetailFilterProduct} from "
 import store from "../../../store";
 import udiRlDetailDialog from "./../../";
 import {addApplyDetail} from "@/api/purchase/purApply";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -349,7 +353,7 @@ export default {
       }
 
       let str = this.multipleSelection.zczbhhzbapzbh;
-            if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;

src/views/sync/SysUdimsConfig.vue

@@ -954,6 +954,7 @@ export default {
         if (isPut) this.checkedBusTypes.push(obj);
       });
       this.addBusDialogVisible = false;
+
     },
     remveBus(index, row) {
       this.checkedBusTypes.splice(index, 1);

src/views/system/dept/invWarehouse.vue

@@ -563,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 = true;
+          this.isShow = false;
         } else {
           this.isAdvanceTypeShow = false;
           this.isShow = true

src/views/thirdSys/api/BasicThirdSysDetailModify.vue

@@ -6,7 +6,7 @@
           <div>
             <el-radio-group v-model="inputDetailQuery.fromType" :disabled="!inputDetailQuery.enabled"
                             style="margin-right: 20px" @change="agreeChange">
-              <el-radio-button :label="0" size="mini" disabled>接口实时获取</el-radio-button>
+              <el-radio-button :label="0" size="mini">接口实时获取</el-radio-button>
               <el-radio-button :label="3" size="mini">接口方式</el-radio-button>
               <el-radio-button :label="2" size="mini" disabled>第三方上传缓存</el-radio-button>
               <el-radio-button :label="1" size="mini">文件方式</el-radio-button>
@@ -20,7 +20,7 @@
       </el-row>
       <el-row :gutter="20" class="el-row" type="flex" align="middle" style="margin-top: 25px">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="接口名称">
+          <el-form-item label-width="120px" label="接口名称">
             <el-input
               style="width: 80%"
               splaceholder="请输入内容"
@@ -32,7 +32,7 @@
       </el-row>
       <el-row :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="接口地址">
+          <el-form-item label-width="120px" label="接口地址">
             <el-input
               style="width: 80%"
               splaceholder="请输入内容"
@@ -43,10 +43,10 @@
       </el-row>
       <el-row v-if="inputDetailQuery.fromType === 3" :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="请求时间">
+          <el-form-item label-width="120px" label="轮询时间(分钟)">
             <el-input
               style="width: 80%"
-              splaceholder="请输入请求时间 单位：分钟"
+              splaceholder="请输入轮序时间 单位：分钟"
               type="number"
               min="0"
               v-model="inputDetailQuery.time"
@@ -55,9 +55,23 @@
         </el-col>
       </el-row>
 
+      <el-row v-if="inputDetailQuery.fromType === 3" :gutter="20" class="el-row" type="flex" align="middle">
+        <el-col :span="24" class="el-col">
+          <el-form-item label-width="120px" label="下载范围(小时)">
+            <el-input
+              style="width: 80%"
+              splaceholder="请输入请求时间 单位：小时"
+              type="number"
+              min="0"
+              v-model="inputDetailQuery.dlLastTime"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">
-          <el-form-item label-width="100px" label="备注说明">
+          <el-form-item label-width="120px" label="备注说明">
             <el-input
               style="width: 80%"
               splaceholder="请输入内容"