From 6208d26b43f7a87027e42651c4e4d8836f9f9b8b Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 24 十一月 2023 17:29:51 +0800
Subject: [PATCH] add:出入库添加物流信息/报表添加详情及打印
---
src/views/overview/AddOverviewDialog.vue | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index e09c059..ee5287f 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -265,7 +265,7 @@
<el-tabs v-model="activeName" type="card">
<!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> -->
<el-tab-pane label="浜у搧" name="first"> </el-tab-pane>
- <el-tab-pane label="鍙戣揣淇℃伅" name="two"></el-tab-pane>
+ <el-tab-pane label="鐗╂祦淇℃伅" name="two" v-if="this.workType===2"></el-tab-pane>
</el-tabs>
<!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
@@ -286,28 +286,51 @@
</template>
</CommonFormTableView>
</div>
- <!-- 鍙戣揣淇℃伅 -->
- <div v-if="activeName==='two'">
+ <!-- 鐗╂祦淇℃伅 -->
+ <div v-if="activeName==='two'&&this.workType===2">
<el-form label-position="left" label-width="80px" :model="shipmentsInfo">
- <el-form-item label="鎵胯繍鍟�" style="width: 50%;">
- <el-select :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="璇烽�夋嫨" style="width: 100%;">
- <el-option
- v-for="item in shipmentsInfo.carrier"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="杩愬崟鍙�" style="width: 50%;">
- <el-input :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
- </el-form-item>
- <el-form-item label="閲嶉噺" style="width: 50%;">
- <el-input :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
- </el-form-item>
- <el-form-item label="鐗╂祦閲嶉噺" style="width: 50%;">
- <el-input :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
- </el-form-item>
+ <el-col :span="12">
+ <el-form-item label="鎵胯繍鍟�" style="width: 80%;" >
+ <el-select :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="璇烽�夋嫨" style="width: 100%;">
+ <el-option
+ v-for="item in shipmentsInfo.carrier"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="杩愬崟鍙�" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏀惰揣浜�" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverName"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱旂郴鐢佃瘽" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverPhone"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏀惰揣鍦板潃" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverAddr"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="閲嶉噺" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐗╂祦閲嶉噺" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
+ </el-form-item>
+ </el-col>
</el-form>
</div>
<!-- 璇︽儏 -->
@@ -672,6 +695,9 @@
weight:data.weight||0,
logisticWeight:data.logisticWeight||0,
logisticCompanyId:data.logisticCompanyId,
+ receiverAddr:data.receiverAddr||'',
+ receiverName:data.receiverName||'',
+ receiverPhone:data.receiverPhone||''
}
return params
},
--
Gitblit v1.8.0