aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
linfso 2024-06-07 09:02:50 +08:00
commit eb07ad83cb
4 changed files with 1563 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/emis/emisTmsPack/packageManagement.vue
View File

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

3
src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
View File

@ -111,7 +111,8 @@
:total="recordTotal" :total="recordTotal"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@sort-change="handleSortChange" @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 type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" /> <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />

1550
src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue Normal file
View File

File diff suppressed because it is too large Load Diff

3
src/views/emis/emisWaybillProblemInfo/problemEntry.vue
View File

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