|
@@ -56,6 +56,8 @@
|
|
|
<span style="display:inline-block;margin-right:10px;">航次:{{shipNo}}</span>
|
|
|
<div style="display:inline-block;margin-right:10px;"> 水单装船重量(吨):<span v-if="shippedWeight>0">{{shippedWeight}}<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
src="../../../public/img/fujian.png" @click="fujian1()" alt="" /></span><ws-button v-if="shippedWeight==0" type="primary" @click="handlefeedback()">反馈</ws-button></div>
|
|
|
+ <div style="display:inline-block;margin-right:10px;"> 水单卸船重量(吨):<span v-if="unloadingWeight>0">{{unloadingWeight}}<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
|
|
|
+ src="../../../public/img/fujian.png" @click="fujian2()" alt="" /></span><ws-button v-if="unloadingWeight==0" type="primary" @click="handledownfeedback()">反馈</ws-button></div>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -229,7 +231,7 @@
|
|
|
<el-input type='number' v-model="shippedWeight" autocomplete="off" placeholder="输入水单装船重量"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="水单截图" >
|
|
|
- <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure"
|
|
|
+ <ws-upload ref="upload" :comp-id="compId" :appendix-ids="unEnclosure"
|
|
|
@onChange="onChange"
|
|
|
accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
|
|
|
</el-form-item>
|
|
@@ -240,11 +242,34 @@
|
|
|
<el-button @click="taskconfirm">确定</el-button>
|
|
|
</div>
|
|
|
</WinseaContentModal>
|
|
|
+ <WinseaContentModal v-model="editshow1" title="卸船反馈"
|
|
|
+ @on-cancel="editshow = false">
|
|
|
+ <el-form :model="taskform">
|
|
|
+ <el-form-item label="重量(吨)" >
|
|
|
+ <el-input type='number' v-model="unloadingWeight" autocomplete="off" placeholder="输入水单卸船重量"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="水单截图" >
|
|
|
+ <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure"
|
|
|
+ @onChange="onChange1"
|
|
|
+ accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="editshow1 = false">取 消</el-button>
|
|
|
+ <el-button @click="taskconfirm">确定</el-button>
|
|
|
+ </div>
|
|
|
+ </WinseaContentModal>
|
|
|
<WinseaContentModal v-model="accessoryTFs1" :title="$t('system.noticeCircular.information')"
|
|
|
@on-cancel="accessoryTFs1 = false">
|
|
|
<ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" :editable="false"
|
|
|
accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
|
|
|
</WinseaContentModal>
|
|
|
+ <WinseaContentModal v-model="accessoryTFs2" :title="$t('system.noticeCircular.information')"
|
|
|
+ @on-cancel="accessoryTFs2 = false">
|
|
|
+ <ws-upload ref="upload" :comp-id="compId" :appendix-ids="unEnclosure" :editable="false"
|
|
|
+ accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
|
|
|
+ </WinseaContentModal>
|
|
|
<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
|
|
|
@on-cancel="accessoryTFs = false">
|
|
|
<div v-for="(item, index) in paymentScreenshotList" :key="'fj'+index">
|
|
@@ -304,6 +329,10 @@
|
|
|
needReapply: true,
|
|
|
taskform:{},
|
|
|
accessoryTFs1:false,
|
|
|
+ editshow1:false,
|
|
|
+ accessoryTFs2:false,
|
|
|
+ unEnclosure:'',
|
|
|
+ unloadingWeight:0,
|
|
|
dialogFormVisible1: false,
|
|
|
dialogFormVisible2: false,
|
|
|
dialogFormVisible3: false,
|
|
@@ -487,9 +516,23 @@
|
|
|
this.$refs.upload.clearFiles()
|
|
|
})
|
|
|
},
|
|
|
+ onChange1() {
|
|
|
+ this.$refs.upload
|
|
|
+ .handleSaveBill()
|
|
|
+ .then(async response => {
|
|
|
+ this.unEnclosure = response
|
|
|
+ })
|
|
|
+ .catch(res => {
|
|
|
+ EventBus.$emit('error', (JSON.parse(res) || {}).message)
|
|
|
+ this.$refs.upload.clearFiles()
|
|
|
+ })
|
|
|
+ },
|
|
|
handlefeedback(){
|
|
|
this.editshow=true
|
|
|
},
|
|
|
+ handledownfeedback(){
|
|
|
+ this.editshow1=true
|
|
|
+ },
|
|
|
taskconfirm(){
|
|
|
if(!this.shippedWeight){
|
|
|
this.$message.warning('水单装船重量不能为空')
|
|
@@ -513,6 +556,29 @@
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
+ taskconfirm1(){
|
|
|
+ if(!this.shippedWeight){
|
|
|
+ this.$message.warning('水单卸船重量不能为空')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(!this.unEnclosure){
|
|
|
+ this.$message.warning('至少上传一个水单截图')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.$confirm(`水单信息提交后不可修改,确认提交?`, {
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ type: 'warning',
|
|
|
+ }).then(() => {
|
|
|
+ edittrantask({id:this.currecttask.id,unloadingWeight:this.unloadingWeight,unEnclosure:this.unEnclosure,tranProcessInfoList:[]}).toPromise().then((response) => {
|
|
|
+ this.editshow=false
|
|
|
+ this.$message.success('提交成功')
|
|
|
+ })
|
|
|
+ .catch((response) => {
|
|
|
+ EventBus.$emit('error', response.message)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
find(){
|
|
|
this.getList()
|
|
|
},
|
|
@@ -531,6 +597,10 @@
|
|
|
console.log(this.enclosure)
|
|
|
this.accessoryTFs1 = true
|
|
|
},
|
|
|
+ fujian2() {
|
|
|
+ console.log(this.enclosure)
|
|
|
+ this.accessoryTFs2 = true
|
|
|
+ },
|
|
|
cur(status) {
|
|
|
if (status == 0) {
|
|
|
this.currect = true
|
|
@@ -1058,6 +1128,8 @@
|
|
|
this.shipNo=response[0].shipNo
|
|
|
this.shippedWeight=response[0].shippedWeight
|
|
|
this.enclosure=response[0].enclosure
|
|
|
+ this.unloadingWeight=response[0].unloadingWeight
|
|
|
+ this.unEnclosure=response[0].unEnclosure
|
|
|
this.currecttask=response[0]
|
|
|
this.getList()
|
|
|
}
|
|
@@ -1075,6 +1147,8 @@
|
|
|
this.shipNo=this.taskNoList1[i].shipNo
|
|
|
this.enclosure=this.taskNoList1[i].enclosure
|
|
|
this.shippedWeight=this.taskNoList1[i].shippedWeight
|
|
|
+ this.unEnclosure=this.taskNoList1[i].unEnclosure
|
|
|
+ this.unloadingWeight=this.taskNoList1[i].unloadingWeight
|
|
|
this.currecttask=this.taskNoList1[i]
|
|
|
// for (let j = 0; j < this.taskNoList.length; j++) {
|
|
|
// this.processNoList.push({
|