md

src/api/emis/emisSupplier.js

@@ -18,6 +18,14 @@ export function listSimpleEmisSupplier(query) {
   })
 }
 
+export function chooseSupplier(query) {
+  return request({
+    url: '/emis/emisSupplier/chooseSupplier',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询公司供应商表详细
 export function getEmisSupplier(id) {
   return request({

src/api/emis/emisTmsSiteBatch.js

@@ -46,6 +46,14 @@ export function addAllEmisTmsSiteBatch(data) {
   })
 }
 
+export function batchEdit(data) {
+  return request({
+    url: '/emis/emisTmsSiteBatch/batchEdit',
+    method: 'put',
+    data: data
+  })
+}
+
 // 修改一级网点TMS组批次
 export function updateEmisTmsSiteBatch(data) {
   return request({

src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue

@@ -89,7 +89,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('供应商')" prop="supplierCode">
-                  <EmisSupplierPicker :placeholder="$t('请选择')" @onChange="onSupplierSelect"  v-model="form.supplierCode"  ></EmisSupplierPicker>
+                  <EmisTmsSiteBatchSupplierPicker :placeholder="$t('请选择')" :startSiteCode="form.startSiteCode" :nextSiteCode="form.nextSiteCode" @onChange="onSupplierSelect"  v-model="form.supplierCode"  ></EmisTmsSiteBatchSupplierPicker>
                 </el-form-item>
               </el-col>
               <el-col :span="8" >
@@ -381,6 +381,7 @@ import moment from 'moment'
 
 import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
 import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
+import EmisTmsSiteBatchSupplierPicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchSupplierPicker';
 
 export default {
   name: "BigBatchEditForm",
@@ -398,7 +399,7 @@ export default {
     },
 
   },
-  components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView,EmisSupplierPicker},
+  components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView,EmisSupplierPicker,EmisTmsSiteBatchSupplierPicker},
   dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status','emis_declare_mode','emis_customs_clear','emis_big_batch_type'],
   data() {
     return {

src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue

@@ -135,7 +135,16 @@
                 :disabled="single"
                 @click="handleUpdate"
                 v-hasPermi="['emis:emisTmsSiteBatch:edit']"
-              >修改批次</el-button>
+              >修改</el-button>
+              <el-button style="margin-right: 5px;"
+                  type="danger"
+                  plain
+                  icon="el-icon-edit"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleBatchUpdate"
+                  v-hasPermi="['emis:emisTmsSiteBatch:edit']"
+                >批量修改</el-button>
               <el-button style="margin-right: 5px;"
                 type="primary"
                 plain
@@ -144,6 +153,7 @@
                 @click="handleBatchAdd"
                 v-hasPermi="['emis:emisTmsSiteBatch:add']"
               >批量导入</el-button>
+                
               <el-button style="margin-right: 5px;"
                 type="danger"
                 plain
@@ -246,6 +256,10 @@
       <BatchImportSiteBatch  @on-changed="handleFormChanged" @on-cancel="cancelForm"></BatchImportSiteBatch>
     </el-dialog>
 
+    <el-dialog :title="titleBatchForm" :visible.sync="openBatchUpdateForm" width="50%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>
+      <BatchSiteBatchUpdateForm :ids="ids"  @on-changed="handleBatchFormChanged" @on-cancel="cancelBatchForm"></BatchSiteBatchUpdateForm>
+    </el-dialog>
+
   </XdPageContainer>
 </template>
 
@@ -268,6 +282,7 @@ import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
 import SysUserSimplePicker from '@/views/emis/EmisBaseTools/SysUserSimplePicker.vue';
 
 import BatchImportSiteBatch from '@/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue';
+import BatchSiteBatchUpdateForm from '@/views/emis/emisTmsSiteBatch/panel/BatchSiteBatchUpdateForm.vue';
 
 
 
@@ -276,7 +291,7 @@ export default {
   components: { EmisGetNextSitePicker, CountryPicker,
      EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker,
      TransProductPicker, PackListView,SysUserSimplePicker,
-     EmisSupplierPicker,BatchImportSiteBatch
+     EmisSupplierPicker,BatchImportSiteBatch,BatchSiteBatchUpdateForm
     },
   dicts: [
     'emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status','emis_declare_mode','emis_customs_clear','emis_big_batch_type'
@@ -325,6 +340,9 @@ export default {
 
       },
 
+      openBatchUpdateForm:false,
+      titleBatchForm: "",
+
       openBatch: false,
       titleBatch: "",
       formBatchBillList:"",
@@ -533,6 +551,20 @@ export default {
       }).catch(() => {});
     },
 
+     /** 修改按钮操作 */
+     handleBatchUpdate(row) {
+        // this.currentId= row.id;
+        this.openBatchUpdateForm = true;
+        this.titleBatchForm = "批量修改";
+    },
+    handleBatchFormChanged(){
+        this.openBatchUpdateForm = false;
+        this.getList();
+    },
+    cancelBatchForm(){
+      this.openBatchUpdateForm = false;
+    },
+
     /** 修改按钮操作 */
     handleUpdate() {
       // let id = this.ids[0]

src/views/emis/emisTmsSiteBatchMiss/index.vue

@@ -89,7 +89,7 @@
            ref="refTable"
            row-key="id"
 
-           storageName="emisTmsSiteBatchMissList_main_240706"
+           storageName="emisTmsSiteBatchMissList_main_240708"
 
            size="small"
            :data="emisTmsSiteBatchMissList"
@@ -127,7 +127,12 @@
       <el-table-column :label="$t('运单号')" align="left" prop="billCode" min-width="150" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('稽核时间')" align="center" prop="createTime" min-width="170" />
       <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="170" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('漏组批次原因')" align="left" prop="missReason" min-width="230" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('异常提示')" align="left" prop="missReasonNormal" min-width="230" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          运单漏组批次或批次录入错误，请检查
+        </template>
+      </el-table-column>
+      <el-table-column v-if="$store.getters.ownerSiteCode == '88888'" :label="$t('漏组批次原因')" align="left" prop="missReason" min-width="230" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('起始节点')" align="left" prop="startSiteName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下一节点')" align="left" prop="nextSiteName" min-width="100" :show-overflow-tooltip="true"/>