up

.env.development

@@ -2,15 +2,15 @@
 ENV='development'
 
 # base api
-VUE_APP_BASE_API = http://192.168.60.99:9004/
+#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_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 = http://192.168.60.18:2021
-VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
+#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
 
-#VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
+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_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= http://suzhouhedaooa.langye.net
-#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
+VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
 
 
 

src/views/component/dialog.vue

@@ -366,7 +366,7 @@ export default {
         if (validate) {
           this.formInfo.forEach((info) => {
             if (info.edit_input === "files") {
-              this.form[info.field] = info._fileList.map(
+              this.form[info.field] = info._fileList?.map(
                 (i) => i?.response?.id
               );
             }

src/views/outbounds/component/addoutbounds.vue

@@ -391,7 +391,11 @@
           {
             title: '物资类型',
             key: 'wuzileixing',
-          }
+          },
+          {
+            title: '入库批次',
+            key: 'rukupici',
+          },
         ],
         wuziList: []
       }

src/views/outbounds/index.vue

@@ -214,15 +214,21 @@
         }
 
         let default_json = {
+          // 'yewukeshi':row.jieyongbumen,
+          // 'bianhao':row.chukushijian+'-'+row.id,
+          // 'wuzimingcheng':row.id_outbounds_items_outbounds_id_relation[0].zichanmingcheng,
+          // 'lingyongshijian':row.chukushijian,
+          // 'shuliang':row.id_outbounds_items_outbounds_id_relation[0].jieyongshuliang,
+          // 'xinghaoguige':row.id_outbounds_items_outbounds_id_relation[0].guigexinghao,
+          // 'jingbanren':row.jilurenyuan,
+          // 'beizhu':row.beizhu,
+          // 'gudingzichanbianhao':row.gudingzichanbianhao,
+          // 'baofeiyuanyin':row.baofeiyuanyin,
           'yewukeshi':row.jieyongbumen,
           'bianhao':row.chukushijian+'-'+row.id,
-          'wuzimingcheng':row.id_outbounds_items_outbounds_id_relation[0].zichanmingcheng,
           'lingyongshijian':row.chukushijian,
-          'shuliang':row.id_outbounds_items_outbounds_id_relation[0].jieyongshuliang,
-          'xinghaoguige':row.id_outbounds_items_outbounds_id_relation[0].guigexinghao,
           'jingbanren':row.jilurenyuan,
           'beizhu':row.beizhu,
-          'gudingzichanbianhao':row.gudingzichanbianhao,
           'baofeiyuanyin':row.baofeiyuanyin,
           'link_id':row.id
         }

src/views/stocks/component/addRuku.vue

@@ -215,10 +215,10 @@
         </div>
         <div class="xy-table-item" v-if="mingxiObj.wuzileixing=='一类一码'">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>入库批次：
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>入库批次：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="mingxiObj.rukupici" ref='piciref' v-if="form.rukuleixing!='回库'" style="width: 300px;"
+            <el-select @change='selectPici' v-model="mingxiObj.rukupici" ref='piciref' v-if="form.rukuleixing!='回库'" style="width: 300px;"
               filterable clearable allow-create default-first-option placeholder="请选择或新增入库批次">
               <el-option v-for="item in rukupiciList" :key="item.value" :label="item.value" :value="item.value">
               </el-option>
@@ -688,8 +688,8 @@
             this.showLoading = true
           })
         }, 500)
-
+        console.log("this.mingxiObj",this.mingxiObj.rukupici)
-        if (this.mingxiObj.wuzibianma == '' || this.mingxiObj.rukushuliang == '') {
+        if (this.mingxiObj.wuzibianma == '' || this.mingxiObj.rukushuliang == '' || this.mingxiObj.rukupici == '') {
           Message({
             type: 'warning',
             message: '请填写完整数据'
@@ -844,6 +844,9 @@
           })
         }
       },
+      selectPici(e){
+        console.log("pici",e)
+      },
       wuziSelect(e) {
         console.log(e)
         this.showList.forEach((items) => {
@@ -910,7 +913,15 @@
         }
         this.editHt = res?.caigouhetong
         this.editQs = res?.qingshiliucheng
-        this.mingxiList = res.id_stocks_items_stocks_id_relation
+        this.mingxiList = []
+        // this.mingxiList = res.id_stocks_items_stocks_id_relation
+        // if(res.rukuleixing=='回库'){
+          for(var r of res.id_stocks_item_links_stocks_id_relation){
+            this.mingxiList.push(JSON.parse(r.yuanshishuju))
+          }
+        // }else{
+        //   this.mingxiList = res.id_stocks_items_stocks_id_relation
+        // }
       },
       submit() {
         this.form.id_stocks_items_stocks_id_relation = this.mingxiList