|
|
@@ -102,7 +102,7 @@
|
|
|
<div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
|
|
|
<div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
|
|
|
<!--司机-->
|
|
|
- <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 0">
|
|
|
+ <ws-form-item label="姓名:" span="1" prop="driver">
|
|
|
<span>{{ item.driver }} </span>
|
|
|
</ws-form-item>
|
|
|
|
|
|
@@ -115,13 +115,9 @@
|
|
|
<span>{{ item.carNo }} </span>
|
|
|
</ws-form-item>
|
|
|
<!--装车(吨)-->
|
|
|
- <ws-form-item label="装车(吨)" span="1" prop="loadNetWeight">
|
|
|
+ <ws-form-item label="装车净重(吨)" span="1" prop="loadNetWeight">
|
|
|
{{ item.loadNetWeight }}
|
|
|
</ws-form-item>
|
|
|
- <!-- 卸车 -->
|
|
|
- <ws-form-item label="卸车(吨)" span="1" prop="unloadNetWeight">
|
|
|
- {{item.unloadNetWeight}}
|
|
|
- </ws-form-item>
|
|
|
<!--磅单-->
|
|
|
<ws-form-item label="磅单" span="1" prop="loadPoundImg">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -137,7 +133,10 @@
|
|
|
@click="fujian(scope.row)"
|
|
|
alt=""
|
|
|
/>
|
|
|
- <div v-show="item.temporaryDriverFlag == 0">
|
|
|
+ <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
|
|
|
+ {{ item.signStatus }}
|
|
|
+ </div>
|
|
|
+ <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
|
|
|
{{ item.signStatus }}
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -160,24 +159,27 @@
|
|
|
>关闭</el-button
|
|
|
>
|
|
|
</div>
|
|
|
+ <!-- 附件弹框 -->
|
|
|
<WinseaContentModal
|
|
|
v-model="accessoryTFs"
|
|
|
:title="$t('system.noticeCircular.information')"
|
|
|
@on-cancel="handleClose"
|
|
|
>
|
|
|
- <p>上传附件</p>
|
|
|
- <ws-upload
|
|
|
- ref="upload"
|
|
|
- table-name="maintain_work_order"
|
|
|
- oss-key="mainPlan"
|
|
|
- :comp-id="compId"
|
|
|
- :file-list="fileList"
|
|
|
- :appendix-ids="appendixIdsAdd"
|
|
|
- :vesselId="deptBudgetList.loadPoundImg"
|
|
|
- :size-limit="size"
|
|
|
- @uploadSuccess="uploadSuccess"
|
|
|
- accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
|
|
|
- />
|
|
|
+ <p>查看附件</p>
|
|
|
+ <div
|
|
|
+ style="display: inline-block; margin: 5px"
|
|
|
+ v-for="item in appendixIdss"
|
|
|
+ >
|
|
|
+ <img width="100" height="100" :src="item" alt="" />
|
|
|
+ </div>
|
|
|
+ </WinseaContentModal>
|
|
|
+ <WinseaContentModal
|
|
|
+ v-model="accesscard"
|
|
|
+ :title="$t('system.noticeCircular.information')"
|
|
|
+ @on-cancel="handleClose1"
|
|
|
+ >
|
|
|
+ <p>查看附件</p>
|
|
|
+ <img width="100" height="100" :src="accessurl" alt="" />
|
|
|
</WinseaContentModal>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -249,12 +251,16 @@ export default {
|
|
|
name: '',
|
|
|
staffList: [],
|
|
|
options: [],
|
|
|
- carModel: [],
|
|
|
+ // carModel: [],
|
|
|
tranCarInfoList: {},
|
|
|
//上传
|
|
|
accessoryTFs: false,
|
|
|
- fileList: [],
|
|
|
- appendixIdsAdd: '',
|
|
|
+ accesscard : false,
|
|
|
+ accessurl: '',
|
|
|
+ // fileList: [],
|
|
|
+ // appendixIdsAdd: '',
|
|
|
+ //附件
|
|
|
+ appendixIdss:[],
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
@@ -271,6 +277,7 @@ export default {
|
|
|
return maxStorage
|
|
|
},
|
|
|
total: function () {
|
|
|
+ if (this.deptBudgetList.tranCarInfoList != null) {
|
|
|
var maxStorage = 0
|
|
|
for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
|
|
|
maxStorage += Number(
|
|
|
@@ -278,6 +285,9 @@ export default {
|
|
|
)
|
|
|
}
|
|
|
return maxStorage
|
|
|
+ }else{
|
|
|
+ return 0
|
|
|
+ }
|
|
|
},
|
|
|
label1: function () {
|
|
|
// for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
|
|
|
@@ -295,32 +305,6 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
- dataFilter(val) {
|
|
|
- this.deptBudgetList.personCharge = val
|
|
|
- if (val) {
|
|
|
- this.options = this.staffList.filter((item) => {
|
|
|
- if (
|
|
|
- !!~item.staffName.indexOf(val) ||
|
|
|
- !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
|
|
|
- ) {
|
|
|
- return true
|
|
|
- }
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.options = this.staffList
|
|
|
- }
|
|
|
- },
|
|
|
- selectstaff(e) {
|
|
|
- for (var i = 0; i < this.staffList.length; i++) {
|
|
|
- if (this.staffList[i].staffName == e) {
|
|
|
- this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
|
|
|
- this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
|
|
|
- // this.deptBudgetList.tranCarInfoList[i].driverPhone = this.staffList[i].staffMobilePhone
|
|
|
- console.log(this.freightspace[i].driverPhone, 'dianhu')
|
|
|
- this.deptBudgetList.personChargeKey = this.staffList[i].staffId
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
marker: function (item) {
|
|
|
this.deptBudgetList.warehousePositioning =
|
|
|
item.lnglat.lat + ',' + item.lnglat.lng
|
|
|
@@ -337,9 +321,9 @@ export default {
|
|
|
handleClose() {
|
|
|
this.dialogViewSpareMoney = false
|
|
|
},
|
|
|
-
|
|
|
- //下拉司机姓名改变事件
|
|
|
- selectdriver() {},
|
|
|
+ handleClose1() {
|
|
|
+ this.accesscard = false
|
|
|
+ },
|
|
|
handleChange(value) {
|
|
|
this.selectedOptions = value
|
|
|
},
|
|
|
@@ -373,27 +357,17 @@ export default {
|
|
|
if (!this.freightspace[i].loadNetWeight) {
|
|
|
this.freightspace[i].loadNetWeight = 0
|
|
|
}
|
|
|
+ if (response.records[i].addressUrl != null) {
|
|
|
+ response.records[i].addressUrlArray =
|
|
|
+ response.records[i].addressUrl.split(',')
|
|
|
+ this.fileList[i] = response.records[i].addressUrl.split(',')
|
|
|
+ } else {
|
|
|
+ response.records[i].addressUrlArray = []
|
|
|
+ }
|
|
|
}
|
|
|
- })
|
|
|
- //司机姓名下拉
|
|
|
- getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.options = response
|
|
|
- this.staffList = response
|
|
|
- })
|
|
|
- //车型
|
|
|
- packList({ constId: 'TRAN5' })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.carModel = response
|
|
|
+
|
|
|
})
|
|
|
},
|
|
|
- handleExamine() {},
|
|
|
- approve() {},
|
|
|
- // returnsales() {
|
|
|
- // this.$router.push({ path: 'purchaseContract' })
|
|
|
- // },
|
|
|
selectChapterTwo(e) {
|
|
|
for (var i = 0; i < this.ChapterTwoList.length; i++) {
|
|
|
if (this.ChapterTwoList[i].constValue == e) {
|
|
|
@@ -432,8 +406,8 @@ export default {
|
|
|
//上传
|
|
|
fujian(row) {
|
|
|
if (
|
|
|
- row.receiveAttachmentPath === null ||
|
|
|
- row.receiveAttachmentPath === ''
|
|
|
+ row.addressUrl === null ||
|
|
|
+ row.addressUrl === ''
|
|
|
) {
|
|
|
EventBus.$emit(
|
|
|
'warning',
|
|
|
@@ -444,6 +418,7 @@ export default {
|
|
|
}
|
|
|
this.appendixIdss = row.receiveAttachmentPath
|
|
|
},
|
|
|
+
|
|
|
},
|
|
|
}
|
|
|
</script>
|
|
|
@@ -522,7 +497,6 @@ export default {
|
|
|
width: 100px;
|
|
|
text-align: center;
|
|
|
background: #fff;
|
|
|
- // border: 1px solid #cdd2dc;
|
|
|
}
|
|
|
.button-container {
|
|
|
display: flex;
|
|
|
@@ -600,8 +574,7 @@ export default {
|
|
|
display: inline-block;
|
|
|
}
|
|
|
.center {
|
|
|
- width: 900px;
|
|
|
- margin: 0 auto;
|
|
|
+ margin-right: 50px;
|
|
|
}
|
|
|
.el-form-item {
|
|
|
width: 50%;
|
|
|
@@ -770,4 +743,24 @@ margin-top: 20px;
|
|
|
.catNosCor{
|
|
|
color: #5473E8;
|
|
|
}
|
|
|
+.signStatus {
|
|
|
+ height: 25px;
|
|
|
+ border-radius: 3px;
|
|
|
+ border: 1px solid #5473e8;
|
|
|
+ padding: 0 3px;
|
|
|
+ margin-left: 90px;
|
|
|
+ color: #ffffff;
|
|
|
+ background: #c4cada;
|
|
|
+ line-height: 24px;
|
|
|
+}
|
|
|
+.signStatus1 {
|
|
|
+ height: 25px;
|
|
|
+ background: #e6ebff;
|
|
|
+ border-radius: 3px;
|
|
|
+ border: 1px solid #5473e8;
|
|
|
+ padding: 0 3px;
|
|
|
+ margin-left: 90px;
|
|
|
+ color: #5473E8;
|
|
|
+ line-height: 24px;
|
|
|
+}
|
|
|
</style>
|
zhongtianhaoyuan