Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

src/views/emis/emisTmsPack/packageManagement.vue

@@ -10,12 +10,18 @@
                 <el-radio label="1">合包号</el-radio>
               </el-radio-group>
             </div>
-            <el-input
+            <!-- <el-input
               v-model="queryParams.packNo"
               :placeholder="$t('多个合包号逗号可换行隔开')"
               clearable
               type="textarea"
               rows="2"
+            /> -->
+            <XdTextareaInput
+              v-model="queryParams.packNo"
+              :placeholder="$t('多个流水号逗号或换行隔开')"
+              clearable
+              :rows="2"
             />
           </el-form-item>
         </el-col>
@@ -627,7 +633,7 @@
 
 <script>
 import { listEmisTmsPack, getPackNo, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
-import { listEmisWaybill, getWaybillDetail } from "@/api/emis/emisWaybill";
+import { listEmisWaybill } from "@/api/emis/emisWaybill";
 import { listEmisTmsPackDtl, delEmisTmsPackDtl, addEmisTmsPackDtl } from "@/api/emis/emisTmsPackDtl";
 // import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
@@ -1216,7 +1222,7 @@ export default {
       this.coData.destCountry = resData.destCountry;
       // this.coData.destCountryName = null;
       this.coData.sendSiteCode = resData.sendSiteCode;
-      this.coData.sendSiteCode = resData.sendSiteName;
+      // this.coData.sendSiteCode = resData.sendSiteName;
       this.coData.nextSiteCode = resData.nextSiteCode;
       // this.coData.nextStation = null;
       this.blUnpack = resData.blUnpack;

src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue

@@ -111,7 +111,8 @@
           :total="recordTotal"
           @selection-change="handleSelectionChange"
           @sort-change="handleSortChange"
-          v-if="tableHeight" :max-height="tableHeight + 'px'"
+          height="300px"
+          max-height="500px"
         >
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />

src/views/emis/emisWaybillProblemInfo/problemEntry.vue

@@ -45,7 +45,7 @@
             <el-col :span="24">
               <el-form-item label="问题图片" prop="xxx" label-width="80px">
                 <ImageUpload v-model="form.picUrl" @input="handleInput" :isShowTip="false" ></ImageUpload>
-                </el-form-item>
+              </el-form-item>
             </el-col>
         </el-row>
       </el-form>
@@ -393,6 +393,7 @@ export default {
               notifySiteName:this.tempRecord.dispatchUnderlingSiteName,
             }
           ]
+          this.form.notifySiteCode = this.tempRecord.sendSiteCode;
           // this.billInputDisabled = true;
           // this.emisWaybillList.push(tempRecord);
           // this.dataMap[this.form.billCode]=tempRecord;