From e383f522e87b06e60d4cf1c3329bfd86c6b98bac Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 14 十二月 2023 15:37:03 +0800
Subject: [PATCH] 出库、入库、调拨编辑的时候入库类型不显示的问题
---
src/views/overview/AddOverviewDialog.vue | 363 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 254 insertions(+), 109 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index ee5287f..9956ae6 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -10,7 +10,7 @@
<div slot="title" class="dialog-header">
<span>{{ editCommonConfig.title === "鏌ョ湅" ? editCommonConfig.title : editCommonConfig.title + addName }}</span>
<div class="header_btns">
- <span class="btn" @click="btnPrint">
+ <span class="btn" :style="{ cursor: thatCursor, color: thatColor }" @click="btnPrint" :disabled="true">
<i class="el-icon-printer"></i>
<span>鎵撳嵃</span>
</span>
@@ -18,7 +18,15 @@
<i class="el-icon-s-tools"></i>
<span>鍔ㄤ綔</span>
</span>
- <el-button v-if="showEdit" :disabled="this.editConfig.infomation.status===5" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
+ <el-button
+ v-if="showEdit"
+ :disabled="this.editConfig.infomation.status === 5"
+ plain
+ size="mini"
+ style="margin-left: 15px"
+ @click="editClick"
+ >缂栬緫</el-button
+ >
</div>
</div>
<!-- 鍐呭 -->
@@ -48,9 +56,29 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
+ <el-form-item prop="number">
+ <span slot="label">{{ workType === 1 ? "鍏ュ簱" : workType === 2 ? "鍑哄簱" : "璋冩嫧" }}鍗曞彿</span>
+ <el-input
+ style="width: 85%"
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ editConfig.title == '鏌ョ湅' ||
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
+ "
+ :disabled="editConfig.title != '鏂板缓'"
+ v-model="editConfig.infomation.number"
+ placeholder="璇疯緭鍏ョ紪鐮�"
+ >
+ </el-input>
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c; width: 85%"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item prop="companyName">
<span slot="label">{{ workType === 1 ? "渚涘簲鍟�" : workType === 2 ? "瀹㈡埛" : "鑱旂郴浜�" }}</span>
-
+
<el-select
v-if="workType === 1"
v-model="editConfig.infomation.companyName"
@@ -94,7 +122,7 @@
:disabled="!showFooter"
@change="companyChange"
>
- <el-option
+ <el-option
v-for="item in companyOptions"
:key="item.id"
:label="item.name"
@@ -102,7 +130,6 @@
>
</el-option>
</el-select>
-
</el-form-item>
</el-col>
<!-- <el-col :span="12">
@@ -265,7 +292,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" v-if="this.workType===2"></el-tab-pane>
+ <el-tab-pane label="鐗╂祦淇℃伅" name="two" v-if="this.workType === 2"></el-tab-pane>
</el-tabs>
<!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
@@ -287,48 +314,89 @@
</CommonFormTableView>
</div>
<!-- 鐗╂祦淇℃伅 -->
- <div v-if="activeName==='two'&&this.workType===2">
- <el-form label-position="left" label-width="80px" :model="shipmentsInfo">
+ <div v-if="activeName === 'two' && this.workType === 2">
+ <el-form
+ :rules="rules2"
+ ref="shipmentsInfo"
+ label-position="right"
+ :model="editConfig.infomation"
+ label-width="120px"
+ size="mini"
+ style="margin-top: 20px"
+ >
<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-form-item label="鎵胯繍鍟�">
+ <el-select
+ size="mini"
+ :disabled="!showFooter"
+ v-model="editConfig.infomation.logisticCompanyId"
+ placeholder="璇烽�夋嫨"
+ style="width: 90%"
+ >
<el-option
- v-for="item in shipmentsInfo.carrier"
+ v-for="item in editConfig.infomation.carrier"
:key="item.id"
:label="item.name"
- :value="item.id">
+ :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 label="杩愬崟鍙�">
+ <el-input
+ style="width: 90%"
+ :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 label="鏀惰揣浜�">
+ <el-input
+ style="width: 90%"
+ :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 label="鑱旂郴鐢佃瘽" prop="receiverPhone">
+ <el-input
+ style="width: 90%"
+ :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 label="鏀惰揣鍦板潃">
+ <el-input
+ style="width: 90%"
+ :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 label="閲嶉噺">
+ <el-input
+ style="width: 90%"
+ :disabled="!showFooter"
+ type="number"
+ 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 label="鐗╂祦閲嶉噺">
+ <el-input
+ style="width: 90%"
+ :disabled="!showFooter"
+ type="number"
+ v-model="editConfig.infomation.logisticWeight"
+ ></el-input>
</el-form-item>
</el-col>
</el-form>
@@ -358,7 +426,7 @@
<!-- 灏� -->
<div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
- <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
+ <el-button type="primary" size="small" @click="saveClick" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -378,9 +446,11 @@
getLogisticCompanyList,
printReceipts
} from "@/api/overview/overview"
-import { getSupplierList,getCompanyList,getClientList } from "@/api/common/other"
+import { getSupplierList, getCompanyList, getClientList } from "@/api/common/other"
+import codeMixin from "@/views/overview/mixin/codeMixin"
export default {
name: "AddOverviewDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -417,11 +487,22 @@
operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
toLocationId: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }],
fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }],
- operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }]
+ operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }]
+ },
+ rules2: {
+ receiverPhone: [
+ // {required: true, message: "璇疯緭鍏ユ墜鏈哄彿", trigger: "change" },
+ {
+ pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
+ message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�",
+ trigger: ["blur", "change"]
+ }
+ ]
},
companyOptions: [], // 鍏徃
- supplierOptions:[],//渚涘簲鍟�
- clientOptions:[],//瀹㈡埛
+ supplierOptions: [], //渚涘簲鍟�
+ clientOptions: [], //瀹㈡埛
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
toLocationOptions: [], // 婧愪綅缃� 浠撳簱浣嶇疆
showButton: true,
@@ -432,7 +513,7 @@
isNoProduct: true, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
- isCancel:false, //楠岃瘉鎸夐挳鏄惁鍙偣鍑�
+ isCancel: false, //楠岃瘉鎸夐挳鏄惁鍙偣鍑�
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
currentState: "todo", // 褰撳墠鐘舵��
detailTableList: {},
@@ -446,13 +527,17 @@
isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
operationTypeOptions: [], // 鍏ュ簱绫诲瀷鍒楄〃
shipmentsInfo: {
- carrier:[],
- waybillNumber:'',
- weight:0,
- logisticWeight:0,
+ carrier: [],
+ waybillNumber: "",
+ weight: 0,
+ logisticWeight: 0,
+ receiverPhone: ""
},
- showCancel:false, // 鍙栨秷鏄惁鍙互鏄剧ず
- list:[],
+ showCancel: false, // 鍙栨秷鏄惁鍙互鏄剧ず
+ list: [],
+ pdfParams: {},
+ thatCursor: this.workType === 3 ? "no-drop" : "pointer",
+ thatColor: this.workType === 3 ? "#ccc" : "#000"
}
},
created() {
@@ -462,25 +547,36 @@
this.setBottonView()
this.setDetailTableForm()
this.getLocationList()
- this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName
+ this.receiptType =
+ this.editConfig.title === "鏌ョ湅" || this.editConfig.title === "缂栬緫"
+ ? this.editConfig.infomation.operationTypeName
+ : this.addName
if (this.showOperationType) {
this.getListTransfer()
}
this.getLogisticCompanyList()
+ this.formInfo()
},
methods: {
- setStatusList(){
- console.log(this.editConfig.infomation,"edit")
- if(this.editConfig.infomation.status===5){
- this.list=[
+ formInfo() {
+ this.objCode.type = this.workType === 1 ? "鍏ュ簱缂栫爜" : this.workType === 2 ? "鍑哄簱缂栫爜" : "璋冩嫧缂栫爜"
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandardID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandardID
+ }
+ this.getRCodeStandardList()
+ },
+ setStatusList() {
+ if (this.editConfig.infomation.status === 5) {
+ this.list = [
{ label: "鑽夌", status: "todo", value: 1 },
{ label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
{ label: "灏辩华", status: "todo", value: 3 },
{ label: "瀹屾垚", status: "todo", value: 4 },
{ label: "宸插彇娑�", status: "todo", value: 5 }
]
- }else{
- this.list=[
+ } else {
+ this.list = [
{ label: "鑽夌", status: "todo", value: 1 },
{ label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
{ label: "灏辩华", status: "todo", value: 3 },
@@ -490,28 +586,28 @@
},
// 鑾峰彇鍏徃鍒楄〃
async getCompanyList() {
- if(this.workType === 1){
+ if (this.workType === 1) {
await getSupplierList().then((res) => {
console.log(res)
if (res.code === 200) {
this.supplierOptions = res.data
}
})
- }else if(this.workType === 2){
+ } else if (this.workType === 2) {
await getClientList().then((res) => {
console.log(res)
if (res.code === 200) {
this.clientOptions = res.data
}
})
- }else{
+ } else {
await getCompanyList().then((res) => {
console.log(res)
if (res.code === 200) {
this.companyOptions = res.data
}
})
- }
+ }
},
// 鑾峰彇浠撳簱浣嶇疆鍒楄〃
async getLocationList() {
@@ -566,13 +662,13 @@
this.showFooter = false
if (this.editConfig.infomation.status === "瀹屾垚") {
this.isValidateClick = false
- }else if(this.editConfig.infomation.status === 3){
+ } else if (this.editConfig.infomation.status === 3) {
this.isValidateClick = true
- this.showCancel=true
- }else if(this.editConfig.infomation.status===5){
- this.isCancel=true
- this.isValidateClick=true
- }else{
+ this.showCancel = true
+ } else if (this.editConfig.infomation.status === 5) {
+ this.isCancel = true
+ this.isValidateClick = true
+ } else {
this.isValidateClick = true
}
} else if (this.editConfig.infomation.status === 4 || this.editConfig.infomation.status === "瀹屾垚") {
@@ -582,7 +678,7 @@
this.showFooter = false
this.isValidateClick = false
} else if (this.editConfig.infomation.status === 5) {
- this.isCancel=true
+ this.isCancel = true
this.showButton = true
this.showEdit = false
this.showFooter = false
@@ -593,7 +689,7 @@
this.showEdit = true
this.showFooter = false
this.isValidateClick = true
- this.showCancel=true
+ this.showCancel = true
}
if (this.editConfig.title === "鏂板缓") {
this.list[0].status = "active"
@@ -619,17 +715,27 @@
this.showFooter = true
this.setTableForm()
},
- async getLogisticCompanyList(){
+ async getLogisticCompanyList() {
await getLogisticCompanyList().then((res) => {
- if(res.code===200){
- this.shipmentsInfo.carrier=res.data
+ if (res.code === 200) {
+ this.editConfig.infomation.carrier = res.data
}
})
},
// 淇濆瓨
- saveClick(formName) {
- this.$refs[formName].validate((valid) => {
- if (valid) {
+ saveClick() {
+ let validArr = []
+ if (this.workType === 2) {
+ console.log("鍑哄簱")
+ validArr = [this.$refs.form.validate()]
+ } else {
+ console.log("鍏ュ簱")
+ validArr = [this.$refs.form.validate()]
+ }
+ console.log(validArr, "xxx")
+ Promise.all(validArr)
+ .then((results) => {
+ console.log(results, "鎵ц鎴愬姛")
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].productName.length === 0) {
this.isNoProduct = true
@@ -649,13 +755,19 @@
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
+ if (this.editConfig.title === "鏂板缓") {
+ this.$message.success("娣诲姞鎴愬姛")
+ } else {
+ this.$message.success("缂栬緫鎴愬姛")
+ }
this.$parent.getData()
}
})
}
- }
- })
+ })
+ .catch((error) => {
+ console.error("琛ㄥ崟鏍￠獙鏈�氳繃:", error)
+ })
},
saveParams() {
let data = this.editConfig.infomation
@@ -691,13 +803,13 @@
sourceNumber: data.sourceNumber || "",
status: 3,
toLocationId: data.toLocationId || 0,
- waybillNumber:data.waybillNumber||'',
- weight:data.weight||0,
- logisticWeight:data.logisticWeight||0,
- logisticCompanyId:data.logisticCompanyId,
- receiverAddr:data.receiverAddr||'',
- receiverName:data.receiverName||'',
- receiverPhone:data.receiverPhone||''
+ waybillNumber: data.waybillNumber || "",
+ weight: data.weight || 0,
+ logisticWeight: data.logisticWeight || 0,
+ logisticCompanyId: data.logisticCompanyId,
+ receiverAddr: data.receiverAddr || "",
+ receiverName: data.receiverName || "",
+ receiverPhone: data.receiverPhone || ""
}
return params
},
@@ -866,42 +978,57 @@
},
// 鍙栨秷
- btnCancel(){
- this.$confirm('纭畾鍙栨秷鍚楋紵', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- stateCancel(this.editConfig.infomation.id).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("鍙栨秷璋冩嫧")
- this.$parent.getData()
- }
+ btnCancel() {
+ this.$confirm("纭畾鍙栨秷鍚楋紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ stateCancel(this.editConfig.infomation.id).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("鍙栨秷璋冩嫧")
+ this.$parent.getData()
+ }
+ })
+ this.list.map((item) => {
+ if (item.label === "宸插彇娑�") {
+ item.status = "active"
+ } else {
+ item.status = "todo"
+ }
+ })
})
- this.list.map((item) => {
- if (item.label==="宸插彇娑�") {
- item.status = "active"
- } else {
- item.status = "todo"
- }
- })
- }).catch(() => {
- });
+ .catch(() => {})
},
//鎵撳嵃
- async btnPrint(){
- await printReceipts(this.editCommonConfig.infomation.id).then((res) => {
- console.log(res)
- if (res.code === 200) {
- this.$message.success("鎵撳嵃鎴愬姛")
- const link = document.createElement('a');
- link.href = res.data;
- link.download = '鍑哄簱鍗�.xlsx';
- link.click();
+ async btnPrint() {
+ if (this.workType !== 3) {
+ localStorage.removeItem("pdfParams")
+ try {
+ let res = await printReceipts(this.editCommonConfig.infomation.id)
+ console.log(res)
+ if (res.code === 200) {
+ console.log(this.editConfig.infomation.baseOperationType, "绫诲瀷")
+ let pdfParams = {
+ url: res.data,
+ baseOperationType: this.editConfig.infomation.baseOperationType || undefined,
+ cutAfterWidth: this.editConfig.infomation.baseOperationType === 2 ? 50.8 : 53.3
+ }
+ var { href } = this.$router.resolve({
+ path: "/overview/previewExcel",
+ query: {
+ ...pdfParams
+ }
+ })
+ window.open(href, "_blank")
+ }
+ } catch (error) {
+ console.error(error)
}
- })
+ }
}
}
}
@@ -914,20 +1041,26 @@
align-items: center;
font-size: 14px;
color: #333;
+
.header_btns {
margin-left: auto;
margin-right: 60px;
+
.btn {
cursor: pointer;
}
- .btn:nth-of-type(2){
+
+ .btn:nth-of-type(2) {
cursor: no-drop;
+ color: #ccc;
}
}
}
+
.content-status {
display: flex;
}
+
.basic-info {
height: calc(100% - 80px);
overflow: auto;
@@ -940,34 +1073,42 @@
// margin-top: 20px;
// }
}
+
.purchase-view {
display: flex;
+
.left {
width: 50%;
}
+
.right {
width: 50%;
}
}
+
.second-label {
margin-left: 20px;
border-bottom: 1px solid #d9d9d9;
margin-bottom: 10px;
}
+
::v-deep {
.el-dialog__headerbtn {
position: absolute;
top: 15px;
}
+
.el-button {
&:hover {
border: 1px solid #dcdfe6;
color: #333;
}
}
+
.el-tabs--card > .el-tabs__header {
border-bottom: none;
}
+
// .el-tabs__item.is-active {
// color: #333;
// background: #f1f3f8;
@@ -978,20 +1119,24 @@
font-size: 13px;
background: #f3f3f3;
}
+
.el-tabs__header {
margin: 0 0 1px;
}
- .bottom{
- .el-form{
+
+ .bottom {
+ .el-form {
// border-top: 1px solid #EBEEF5;
}
- .el-form-item{
+
+ .el-form-item {
height: 28px;
+
.el-input {
- input{
+ input {
height: 28px;
}
- }
+ }
}
}
}
--
Gitblit v1.8.0