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/basic/business/stockOrderPrint.vue

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

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/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/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/inner/innerOrderEditDialog.vue

@@ -49,6 +49,7 @@
           <el-table-column label="规格型号" prop="spec"  show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname"  show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业"  prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="最小销售产品标识" prop="nameCode" width="140" v-if="showColumn"></el-table-column>
           <el-table-column label="单据数量">
             <template slot-scope="scope">
               <el-input size="small" v-model="scope.row.count"
@@ -160,6 +161,7 @@ export default {
   },
   data() {
     return {
+      showColumn: false,
       code: "",
       query: {
         orderIdFk: "",
@@ -174,6 +176,7 @@ export default {
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        packLevel:null,
       },
       formRules: {},
       codeArray: [],
@@ -437,6 +440,7 @@ export default {
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        nameCode:null,
       };
       this.orderEditor = false;
     }

src/views/inventory/inner/innerOrderSelectProduct.vue

@@ -224,6 +224,8 @@ export default {
       certList: [],
       dialogFormVisible: false,
       multipleSelection: null,
+      nameCode:null,
+
     };
   },
   methods: {
@@ -339,6 +341,7 @@ export default {
       let tQuery = {
         productId: this.multipleSelection.rlId,
         productName: this.multipleSelection.cpmctymc,
+        nameCode: this.multipleSelection.nameCode,
         count: 1,
         orderIdFk: this.billNo,
         supId: this.multipleSelection.customerId,

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",
@@ -302,11 +306,11 @@ export default {
 
       this.loading = true;
       this.listQuery.customerId = store.getters.customerId;
-            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
+      if (this.listQuery.customerId == 110 && this.data.formData != null && this.data.formData != undefined) {
-                this.listQuery.companyName=this.data.formData.corpName
+        this.listQuery.companyName = this.data.formData.corpName
       }
-            if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){
+      if (this.listQuery.customerId != 110 && this.data != null && this.data != undefined) {
-                this.listQuery.companyName=this.data.corpName
+        this.listQuery.companyName = this.data.corpName
       }
 
       stockOrderDetailFilterProduct(this.listQuery)
@@ -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;
@@ -360,12 +364,12 @@ export default {
     combine() {
       this.loading = true;
       let tQuery = {
-          productId:this.multipleSelection.rlId,
+        productId: this.multipleSelection.rlId,
-          productName:this.multipleSelection.cpmctymc,
+        productName: this.multipleSelection.cpmctymc,
-          count:1,
+        count: 1,
-          orderIdFk:this.pId,
+        orderIdFk: this.pId,
-          supId:this.multipleSelection.customerId,
+        supId: this.multipleSelection.customerId,
-          zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
       };
       addPlanDetail(tQuery).then((response) => {
         this.loading = false;

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",
@@ -303,11 +307,11 @@ export default {
 
       this.loading = true;
       this.listQuery.customerId = store.getters.customerId;
-            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
+      if (this.listQuery.customerId == 110 && this.data.formData != null && this.data.formData != undefined) {
-                this.listQuery.companyName=this.data.formData.corpName
+        this.listQuery.companyName = this.data.formData.corpName
       }
-            if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){
+      if (this.listQuery.customerId != 110 && this.data != null && this.data != undefined) {
-                this.listQuery.companyName=this.data.corpName
+        this.listQuery.companyName = this.data.corpName
       }
 
       stockOrderDetailFilterProduct(this.listQuery)
@@ -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;
@@ -361,12 +365,12 @@ export default {
     combine() {
       this.loading = true;
       let tQuery = {
-          productId:this.multipleSelection.rlId,
+        productId: this.multipleSelection.rlId,
-          productName:this.multipleSelection.cpmctymc,
+        productName: this.multipleSelection.cpmctymc,
-          count:1,
+        count: 1,
-          orderIdFk:this.pId,
+        orderIdFk: this.pId,
-          supId:this.multipleSelection.customerId,
+        supId: this.multipleSelection.customerId,
-          zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
       };
       addPlanDetail(tQuery).then((response) => {
         this.loading = false;

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="请输入内容"