切换分支备份

.env.production

@@ -21,7 +21,7 @@ ENV = 'production'
 
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
@@ -65,12 +65,12 @@ VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 
 # 南靖
-# VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
 # 测试NIGINX
 # VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://192.168.0.132:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.132:9150/UDI_WMS_MC/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

src/views/basic/product/productEdit.vue

@@ -498,6 +498,24 @@
               </el-col>
             </el-row>
             <el-divider></el-divider>
+            <el-row>
+              <el-col span="5">
+                <span class="sptext">是否组套</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.isStack" style="width: 65%" placeholder="选择是否组套" clearable>
+                  <el-option label="是" :value="true"></el-option>
+                  <el-option label="否" :value="false"></el-option>
+                </el-select>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">是否组套</span>
+              </el-col>
+            </el-row>
+            <el-divider></el-divider>
+
             <el-row>
               <el-col span="5">
                 <span class="sptext">多次/重复使用耗材</span>
@@ -750,7 +768,14 @@
 </template>
 
 <script>
-import {getYbHcflDetail,disableUdi, removeDiRl, removeRl, thirdSysDetail, updatetSingleUdiInfo} from "@/api/basic/product/udiRelevance";
+import {
+  getYbHcflDetail,
+  disableUdi,
+  removeDiRl,
+  removeRl,
+  thirdSysDetail,
+  updatetSingleUdiInfo
+} from "@/api/basic/product/udiRelevance";
 import {isBlank} from "@/utils/strUtil";
 import {filterByUuid} from "@/api/basic/product/udiInfo";
 import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
@@ -832,7 +857,7 @@ export default {
     Treeselect
   },
   created() {
-    console.log("dayinshshhs",this.editQuery)
+    console.log("dayinshshhs", this.editQuery)
     this.useMutiChange(true)
     this.getThirdSysDetail();
     if (this.editQuery.isDateBy == 1) {
@@ -851,7 +876,7 @@ export default {
     this.classifySearch("")
   },
   methods: {
-    classifyChange(){
+    classifyChange() {
       this.classifyChange(this.editQuery.flbm)
       let item = this.classifyList.find(item => item.code == this.editQuery.flbm)
       if (item != null) this.editQuery.requireScanCode = item.requireScanCode;
@@ -870,7 +895,7 @@ export default {
           this.classifyList = [];
         });
     },
-    getYbHcData(){
+    getYbHcData() {
       let query = {
         specificationCode: this.editQuery.ybbm
       };
@@ -882,7 +907,7 @@ export default {
           this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
           this.editQuery.matrial = this.ybHcflDetail.matrial
           this.$forceUpdate();
-        }else {
+        } else {
           this.editQuery.catalogname1 = ""
           this.editQuery.catalogname2 = ""
           this.editQuery.catalogname3 = ""
@@ -893,7 +918,7 @@ export default {
       })
 
     },
-    onClose(){
+    onClose() {
       this.$emit("onClose")
     },
     diableChange() {