Andy 4 years ago
parent
commit
3958c2e065

File diff suppressed because it is too large
+ 489 - 480
src/views/ChipPrintScreen/ChipPrintScreen.vue


+ 5 - 0
src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -514,6 +514,7 @@ export default {
       selectedObj: {},
       ordernoObj: {
         title: "订单编号/项目名称选择",
+        currentSearchValue: "",
         list: [],
         hasChild: false,
       },
@@ -525,6 +526,7 @@ export default {
       rownoObj: {},
       currencySelectedObj: {
         title: "订单编号/项目名称选择",
+        currentSearchValue: "",
         type: 1,
         list: [],
       },
@@ -574,6 +576,7 @@ export default {
         return this.$Message.warning("请先选择项目");
       }
       this.currentSearchValue = "";
+      this.currentSearchValue = obj.currentSearchValue;
       this.currencySelectedObj = obj;
       this.selectionModal = true;
       this.currencySelectedObj.type = type;
@@ -636,11 +639,13 @@ export default {
         this.selectionModal = false;
         this.selectionDetailModal = true;
         this.chooseDetailUrlNo = obj;
+        this.currentSearchValue = this.rownoObj.currentSearchValue;
         this.contentData = [];
         this.total = 0;
       } else {
         // 订单号
         this.chooseOrderNo = obj;
+        this.currentSearchValue = this.ordernoObj.currentSearchValue;
       }
       if (row.type == 1) {
         this.handleSelectionComfirm(this.currencySelectedObj);

+ 2 - 2
vue.config.js

@@ -1,13 +1,13 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://121.37.173.82:82"
+    ? "http://124.71.176.88:882"
     : process.env.NODE_ENV == "test-prd"
     ? "http://121.41.102.225:82" //测试服
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:82";
 //  http://124.71.176.88:882  //江山
-// 'http://124.71.176.88:882' :测试
+// 'http://121.41.102.225:82' :测试
 
 process.env.VUE_APP_BASE_URL = axios_default_ip;
 module.exports = {

Some files were not shown because too many files changed in this diff