up

.env.development

@@ -2,15 +2,15 @@
 ENV='development'
 
 # base api
-VUE_APP_BASE_API = http://192.168.60.99:9004/
-VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
-VUE_APP_OA_URL = http://192.168.60.18:2021
-VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
+#VUE_APP_BASE_API = http://192.168.60.99:9004/
+#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
+#VUE_APP_OA_URL = http://192.168.60.18:2021
+#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
 
-#VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
-#VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
-#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
-#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
+VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
+VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
+VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
+VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
 
 
 

src/views/outbounds/component/addoutbounds.vue

@@ -425,8 +425,9 @@
           this.$nextTick(() => {
             this.showLoading = true
           })
-        }, 500)
-        if (this.mingxiObj.wuzibianma == '' || this.mingxiObj.jieyongshuliang == '' || this.mingxiObj.shifouhuiku ==
+        }, 500)
+
+        if (JSON.stringify(this.mingxiObj)=="{}"||this.mingxiObj.wuzibianma == '' || this.mingxiObj.jieyongshuliang == '' || this.mingxiObj.shifouhuiku ==
           '') {
           Message({
             type: 'warning',
@@ -499,7 +500,6 @@
         }
       },
       showWuzi() {
-        console.log("123")
         this.isShowWuzi = true
       },
       async getWuzi() {
@@ -537,9 +537,18 @@
             this.mingxiObj.jiliangdanwei = e.jiliangdanwei
             this.mingxiObj.inventorys_id = e.id
             this.mingxiObj.guigexinghao = e.guigexinghao
-
           }
-        });
+        });
+        this.mingxiList.map(item=>{
+          if(item.inventorys_id===this.mingxiObj.inventorys_id){
+            Message({
+              type: 'warning',
+              message: `${item.wuzibianma}${item.zichanmingcheng}已选择`
+            })
+            this.mingxiObj = {}
+            return
+          }
+        })
 
       },
       wuziPageChange(e) {
@@ -571,8 +580,14 @@
           chukumingxi: ''
         }
         this.mingxiList = res.id_outbounds_items_outbounds_id_relation
+      },
+      countNum(arr,value){
+
       },
-      submit() {
+      submit() {
+        console.log("this.mingxiList",this.mingxiList)
+
+        // return
         this.form.id_outbounds_items_outbounds_id_relation = this.mingxiList
         // return
         if (this.type === 'add') {