'首次提交'

dev3
wuwx 2024-04-29 17:03:52 +08:00
parent fef5854a56
commit 2c637fb0cf
10 changed files with 218 additions and 41 deletions

View File

@ -92,7 +92,7 @@ module.exports = {
// 创建工班信息详细 workMessageRespInfoList
createWorkMessageRespInfoList() {
let sql =
'CREATE TABLE if not exists workMessageRespInfoList ("webId" text NOT NULL,"vtpId" text,"contactId" text,"carType" text,"carTypeName" text,"goodsNumber" text,"loadingType" text,"loadingTypeName" text,"remark" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));'
'CREATE TABLE if not exists workMessageRespInfoList ("webId" text NOT NULL,"vtpId" text,"contactId" text,"carType" text,"carTypeName" text,"goodsNumber" text,"loadingType" text,"loadingTypeName" text,"remark" text,"mnfBl" text,"weight" text,"volume" text,"lengthType" text,"pmtType" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));'
this.executeSql(sql)
},
// 创建工班信息翻仓 retallyMessageRespList

View File

@ -109,11 +109,11 @@
this.outVvyId = ""
this.outVvyName = ""
if (v.importExportFlagName == '出口') {
this.inVvyId = v.vvyId
this.inVvyName = v.vvyName
} else {
this.outVvyId = v.vvyId
this.outVvyName = v.vvyName
} else {
this.inVvyId = v.vvyId
this.inVvyName = v.vvyName
}
let obj = {
inVvyId: this.inVvyId,

View File

@ -146,7 +146,7 @@
dcList:[
{
value: "0",
name: "待作业"
name: "未开始"
},
{
value: "1",
@ -157,7 +157,7 @@
name: "已完成"
},
],
vvyStatus:'待作业',
vvyStatus:'未开始',
operationDate:'',
startDate:'',
endDate:'',

View File

@ -916,7 +916,7 @@
this.getBrand() //
this.getBvm() //
this.getRoleId() // ID
this.initAsk() //
// this.initAsk() //
this.getStatistics() //
this.getJobProgress() //
@ -967,6 +967,8 @@
},
//
refresh() {
this.itemList = []
this.current = 1
if (this.tabsValue == 1 || this.tabsValue == 2) {
this.loadOtherOrder()
} else if (this.tabsValue == 0) {
@ -1114,7 +1116,7 @@
teamFlag = true
}
uni.request({
url: `${this.$local}/api/unload/command/pageCommandForBranch?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&bvmId=${this.bvmId}&sendStatus=${this.sendValue}&size=${this.pageSize}&current=${this.current}&tradeType=${this.tradeType}`,
url: `${this.$local}/api/unload/command/pageCommandForBranch?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&bvmId=${this.bvmId}&sendStatus=${this.sendValue}&size=${this.pageSize}&current=${this.current}&tradeType=${this.tradeType}&teamFlag=${teamFlag}`,
header: {
'Content-Type': 'application/json', //
'Authorization': `Bearer ${this.loginObj.access_token}`
@ -1431,6 +1433,7 @@
},
//
ask(type) {
this.initAsk() //
this.$refs.popup2.open(type)
},
//
@ -2728,6 +2731,13 @@
/deep/.uni-select__input-text {
text-align: left;
}
/deep/.is-textarea {
width: 77vw;
height: 21vh;
}
/deep/.uni-easyinput__content-textarea {
height: 20vh;
}
.popupBtn {
margin-top: 20px;
@ -2757,7 +2767,8 @@
}
.popupBox2 {
width: 500px;
width: 80vw;
height: 38vh;
}
//

View File

@ -200,7 +200,7 @@
</view>
<view class="cell">
<text>型号</text>
<text>{{item2.bvdName}}</text>
<text>{{item2.model}}</text>
</view>
</view>
</view>
@ -283,7 +283,7 @@
</template>
</template>
<template v-else>
<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'fzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
<view class="label">{{ item.label }}</view>
<lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
contentColor="#0067CF"
@ -422,7 +422,7 @@
</view>
<view class="cell">
<text>型号</text>
<text>{{item2.bvdName}}</text>
<text>{{item2.model}}</text>
</view>
</view>
</view>
@ -790,7 +790,7 @@
this.getBrand() //
this.getBvm() //
this.getRoleId() // ID
this.initAsk() //
// this.initAsk() //
this.getStatistics() //
this.getJobProgress() //
},
@ -828,6 +828,8 @@
this.fzlFlag = true
},
refresh() {
this.itemList = []
this.current = 1
if (this.tabsValue == 0 || this.tabsValue == 1) {
this.domesticTrade()
}
@ -1253,6 +1255,7 @@
},
//
ask(type) {
this.initAsk() //
this.$refs.popup2.open(type)
},
//
@ -2516,7 +2519,14 @@
/deep/.uni-select__input-text {
text-align: left;
}
/deep/.is-textarea {
width: 77vw;
height: 21vh;
}
/deep/.uni-easyinput__content-textarea {
height: 20vh;
}
.popupBtn {
margin-top: 20px;
padding: 14px 0;
@ -2545,7 +2555,8 @@
}
.popupBox2 {
width: 500px;
width: 80vw;
height: 38vh;
}
//

View File

@ -146,7 +146,7 @@
dcList:[
{
value: "0",
name: "待作业"
name: "未开始"
},
{
value: "1",
@ -157,7 +157,7 @@
name: "已完成"
},
],
vvyStatus:'待作业',
vvyStatus:'未开始',
operationDate:'',
startDate:'',
endDate:'',

View File

@ -204,7 +204,7 @@
</view>
<view class="cell">
<text>型号</text>
<text>{{item2.bvdName}}</text>
<text>{{item2.model}}</text>
</view>
</view>
</view>
@ -287,7 +287,7 @@
</template>
</template>
<template v-else>
<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'fzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
<view class="label">{{ item.label }}</view>
<lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
contentColor="#0067CF"
@ -427,7 +427,7 @@
</view>
<view class="cell">
<text>型号</text>
<text>{{item2.bvdName}}</text>
<text>{{item2.model}}</text>
</view>
</view>
</view>
@ -470,7 +470,7 @@
</view>
</view>
<template>
<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'bzz')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
<view class="label">{{ item.label }}</view>
<lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
contentColor="#0067CF"
@ -587,7 +587,7 @@
</view>
<view class="cell">
<text>型号</text>
<text>{{item2.bvdName}}</text>
<text>{{item2.model}}</text>
</view>
</view>
</view>
@ -680,7 +680,7 @@
</view>
</view>
<view class="heightBox">
{{item.tierHeight}}m
<view v-for="(itex,index) in item.tierHeightListCo" :key="index">{{ itex }}</view>
</view>
</view>
@ -1096,7 +1096,7 @@
this.getBrand() //
this.getBvm() //
this.getRoleId() // ID
this.initAsk() //
// this.initAsk() //
this.getStatistics() //
this.getPotList()
this.getImgInfo()
@ -1146,6 +1146,8 @@
},
//
refresh() {
this.itemList = []
this.current = 1
if (this.tabsValue == 1 || this.tabsValue == 2) {
this.loadOtherOrder()
} else if (this.tabsValue == 0) {
@ -1279,9 +1281,7 @@
},
method: 'GET', //
success: (res) => {
// this.itemList.push(...res.data.data.records)
this.itemList = []
this.itemList = res.data.data.records
this.itemList.push(...res.data.data.records)
if (res.data.data.records.length == 10) {
this.current++
this.loadSumOrder()
@ -1459,7 +1459,8 @@
method: 'POST', //
success: (res) => {
this.$refs.popup.close()
if (res.status == 200) {
console.log('res',res);
if (res.data.status == 200 || res.data.data) {
this.itemList = []
this.current = 1
this.delValue = true
@ -1653,6 +1654,7 @@
},
//
ask(type) {
this.initAsk() //
this.$refs.popup2.open(type)
},
//
@ -2818,6 +2820,7 @@
/deep/.uni-table-td {
padding-left: 15px;
font-size: 16px;
}
}
}
@ -3065,6 +3068,13 @@
/deep/.uni-select__input-text {
text-align: left;
}
/deep/.is-textarea {
width: 77vw;
height: 21vh;
}
/deep/.uni-easyinput__content-textarea {
height: 20vh;
}
.popupBtn {
margin-top: 20px;
@ -3094,7 +3104,8 @@
}
.popupBox2 {
width: 500px;
width: 80vw;
height: 38vh;
}
//

View File

@ -245,7 +245,7 @@
},
dropTable() {
console.log('删除表');
let sql = 'DROP TABLE shipOption;'
let sql = 'DROP TABLE workMessageRespInfoList'
this.executeSql(sql)
},
dropData() {
@ -541,6 +541,44 @@
ptrEnDesc:''
})
})
//
this.downloadData.pmtType.forEach(v => {
this.optionData.push({
dictionariesName: "pmtType",
ptrCode: v.ptrCode,
ptrDesc: v.ptrDesc,
ptrEnDesc:v.ptrEnDesc
})
})
//
this.downloadData.pubTypeLengthType.forEach(v => {
this.optionData.push({
dictionariesName: "pubTypeLengthType",
ptrCode: v.ptrCode,
ptrDesc: v.ptrDesc,
ptrEnDesc:v.ptrEnDesc
})
})
//
this.downloadData.portDetail.forEach(v => {
this.optionData.push({
dictionariesName: "portDetail",
ptrCode: v.ptrCode,
ptrDesc: v.ptrDesc,
ptrEnDesc:v.ptrEnDesc
})
})
//
this.downloadData.mnfBlByVvyId.forEach(item => {
item.mnfBls.forEach(v => {
this.optionData.push({
dictionariesName: "mnfBlByVvyId",
ptrCode: '',
ptrDesc: v,
ptrEnDesc:''
})
})
})
//
this.xlData(item.vtpId)
@ -576,8 +614,8 @@
if (v.workMessageDetailRespDTOS.length > 0) {
v.workMessageDetailRespDTOS.forEach(v2 => {
let sql2 = `insert into workMessageRespInfoList values('${v2.wkdId}','${this.vtpId}','${v2.wkmId}','${v2.carType}',
'${v2.carTypeName}','${v2.goodsNumber}','${v2.loadingType}','${v2.loadingTypeName}','${v2.remark}',
'${webStatus}','${v.createTime}')`
'${v2.carTypeName}','${v2.goodsNumber}','${v2.loadingType}','${v2.loadingTypeName}','${v2.remark}','${v2.mnfBl}',
'${v2.weight}','${v2.volume}','${v2.lengthType}','${v2.pmtType}','${webStatus}','${v.createTime}')`
this.executeSql(sql2)
})
}
@ -1008,7 +1046,6 @@
})
} else if (tableName == "messageRespList") {
that.messageRespList = value
console.log(value)
} else if (tableName == "workMessageRespList") {
that.workMessageRespList = value
that.workMessageRespList.forEach(v => {

View File

@ -57,7 +57,7 @@
textFilter }}-{{ RYSJ[0].maxEndTime | textFilter }}</text>
</view>
<view class="li">
<text>Berthed at Haitong:</text><text>
<text>Berthed at {{ portInfo }}:</text><text>
<checkbox-group>
<label>
1
@ -757,7 +757,9 @@ export default {
JSGR: [],
RYSJ: [],
carList:[],
weatherList:[]
weatherList:[],
portInfo:'',
portObj:{}
}
},
onLoad(option) {
@ -767,6 +769,7 @@ export default {
},
mounted() {
this.vtpId = uni.getStorageSync('vtpId')
this.portObj = uni.getStorageSync('portObj')
let that = this
that.executeSql2()
that.executeSql('shipInfoTable')
@ -870,6 +873,10 @@ export default {
this.carList.push(item)
} else if(item.dictionariesName == 'weather') {
this.weatherList.push(item)
} else if(item.dictionariesName == 'portDetail') {
if(item.ptrDesc == this.portObj.portName) {
this.portInfo = item.ptrEnDesc
}
}
})
}

View File

@ -91,6 +91,32 @@
@change="fsChange(item,index,item2,index2,'left')"
placeholder="请选择装卸方式"></uni-data-select>
</view>
<view class="li widthLi">
<p class="liTitle">提单号</p>
<uni-data-select v-model="item2.mnfBl" :localdata="mnfBlList"
placeholder="请选择提单号"></uni-data-select>
</view>
<view class="li widthLi">
<p class="liTitle">重量</p>
<uni-easyinput type="digit" v-model="item2.weight"
placeholder="请输入重量"></uni-easyinput>
</view>
<view class="li widthLi">
<p class="liTitle">体积</p>
<uni-easyinput type="digit" v-model="item2.volume"
placeholder="请输入体积"></uni-easyinput>
</view>
<view class="li widthLi">
<p class="liTitle">超长类型</p>
<uni-data-select v-model="item2.lengthType" :localdata="lengthTypeList"
placeholder="请选择超长类型"></uni-data-select>
</view>
<view class="li widthLi">
<p class="liTitle">使用机械</p>
<uni-data-select v-model="item2.pmtType" :localdata="pmtTypeList"
placeholder="请选择使用机械"></uni-data-select>
</view>
<view class="li widthLi iLi">
<p class="liTitle">备注</p>
<uni-easyinput type="textarea" v-model="item2.remark"
@ -148,6 +174,32 @@
@change="fsChange(item,index,item2,index2,'right')"
placeholder="请选择装卸方式"></uni-data-select>
</view>
<view class="li widthLi">
<p class="liTitle">提单号</p>
<uni-data-select v-model="item2.mnfBl" :localdata="mnfBlList"
placeholder="请选择提单号"></uni-data-select>
</view>
<view class="li widthLi">
<p class="liTitle">重量</p>
<uni-easyinput type="digit" v-model="item2.weight"
placeholder="请输入重量"></uni-easyinput>
</view>
<view class="li widthLi">
<p class="liTitle">体积</p>
<uni-easyinput type="digit" v-model="item2.volume"
placeholder="请输入体积"></uni-easyinput>
</view>
<view class="li widthLi">
<p class="liTitle">超长类型</p>
<uni-data-select v-model="item2.lengthType" :localdata="lengthTypeList"
placeholder="请选择超长类型"></uni-data-select>
</view>
<view class="li widthLi">
<p class="liTitle">使用机械</p>
<uni-data-select v-model="item2.pmtType" :localdata="pmtTypeList"
placeholder="请选择使用机械"></uni-data-select>
</view>
<view class="li widthLi iLi">
<p class="liTitle">备注</p>
<uni-easyinput type="textarea" v-model="item2.remark"
@ -403,7 +455,10 @@
flag: true,
lotusLoadingData: {
isShow: false //truefalse
}
},
mnfBlList:[],
lengthTypeList:[],
pmtTypeList:[]
}
},
components: {
@ -448,6 +503,11 @@
loadingType: "",
loadingTypeName: "",
remark: "",
mnfBl:'',
weight:'',
volume:'',
lengthType:'',
pmtType:''
}]
}]
}
@ -685,6 +745,25 @@
value: v.ptrCode
})
})
//
this.optionData.forEach((v, index) => {
if (v.dictionariesName == 'mnfBlByVvyId') {
this.mnfBlList.push({
text: v.ptrDesc,
value: v.ptrDesc
})
} else if(v.dictionariesName == 'pubTypeLengthType') {
this.lengthTypeList.push({
text: v.ptrDesc,
value: v.ptrCode
})
} else if(v.dictionariesName == 'pmtType') {
this.pmtTypeList.push({
text: v.ptrDesc,
value: v.ptrCode
})
}
})
},
//
editData() {
@ -791,6 +870,11 @@
loadingType: "",
loadingTypeName: "",
remark: "",
mnfBl:'',
weight:'',
volume:'',
lengthType:'',
pmtType:''
}],
}
this.addItem(item)
@ -807,6 +891,11 @@
loadingType: "",
loadingTypeName: "",
remark: "",
mnfBl:'',
weight:'',
volume:'',
lengthType:'',
pmtType:''
})
uni.showToast({
icon: 'none',
@ -821,6 +910,11 @@
loadingType: "",
loadingTypeName: "",
remark: "",
mnfBl:'',
weight:'',
volume:'',
lengthType:'',
pmtType:''
})
uni.showToast({
icon: 'none',
@ -1232,6 +1326,7 @@
},
//
delGb(item, index) {
console.log('item',item);
this.leftUlList1.splice(index, 1)
if (item.webId != null) {
this.shiftDelList.push(item.webId)
@ -1579,7 +1674,8 @@
let sql2 =
`UPDATE workMessageRespInfoList SET carType = '${this.ulList1[i].ulList2[j].carType}',carTypeName = '${this.ulList1[i].ulList2[j].carTypeName}',
goodsNumber = '${this.ulList1[i].ulList2[j].goodsNumber}', loadingType = '${this.ulList1[i].ulList2[j].loadingType}',
loadingTypeName = '${this.ulList1[i].ulList2[j].loadingTypeName}', remark = '${this.ulList1[i].ulList2[j].remark}',
loadingTypeName = '${this.ulList1[i].ulList2[j].loadingTypeName}', remark = '${this.ulList1[i].ulList2[j].remark}', mnfBl = '${this.ulList1[i].ulList2[j].mnfBl}',
weight = '${this.ulList1[i].ulList2[j].weight}', volume = '${this.ulList1[i].ulList2[j].volume}', lengthType = '${this.ulList1[i].ulList2[j].lengthType}', pmtType = '${this.ulList1[i].ulList2[j].pmtType}',
webStatus = '${webStatus}', webDate = '${webDate}' WHERE webId = '${this.ulList1[i].ulList2[j].webId}';`
this.executeSql(sql2)
} else {
@ -1588,7 +1684,8 @@
let sql2 =
`insert into workMessageRespInfoList values('${webId2}','${this.vtpId}','${this.ulList1[i].webId}','${this.ulList1[i].ulList2[j].carType}',
'${this.ulList1[i].ulList2[j].carTypeName}','${this.ulList1[i].ulList2[j].goodsNumber}','${this.ulList1[i].ulList2[j].loadingType}',
'${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${webStatus}','${webDate}')`
'${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${this.ulList1[i].ulList2[j].mnfBl}','${this.ulList1[i].ulList2[j].weight}',
'${this.ulList1[i].ulList2[j].volume}','${this.ulList1[i].ulList2[j].lengthType}','${this.ulList1[i].ulList2[j].pmtType}','${webStatus}','${webDate}')`
this.executeSql(sql2)
}
}
@ -1607,7 +1704,8 @@
let sql2 =
`UPDATE workMessageRespInfoList SET carType = '${this.ulList1[i].ulList2[j].carType}',carTypeName = '${this.ulList1[i].ulList2[j].carTypeName}',
goodsNumber = '${this.ulList1[i].ulList2[j].goodsNumber}', loadingType = '${this.ulList1[i].ulList2[j].loadingType}',
loadingTypeName = '${this.ulList1[i].ulList2[j].loadingTypeName}', remark = '${this.ulList1[i].ulList2[j].remark}',
loadingTypeName = '${this.ulList1[i].ulList2[j].loadingTypeName}', remark = '${this.ulList1[i].ulList2[j].remark}', mnfBl = '${this.ulList1[i].ulList2[j].mnfBl}',
weight = '${this.ulList1[i].ulList2[j].weight}', volume = '${this.ulList1[i].ulList2[j].volume}', lengthType = '${this.ulList1[i].ulList2[j].lengthType}', pmtType = '${this.ulList1[i].ulList2[j].pmtType}',
webStatus = '${webStatus}', webDate = '${webDate}' WHERE webId = '${this.ulList1[i].ulList2[j].webId}';`
this.executeSql(sql2)
} else {
@ -1616,7 +1714,8 @@
let sql2 =
`insert into workMessageRespInfoList values('${webId2}','${this.vtpId}','${webId}','${this.ulList1[i].ulList2[j].carType}',
'${this.ulList1[i].ulList2[j].carTypeName}','${this.ulList1[i].ulList2[j].goodsNumber}','${this.ulList1[i].ulList2[j].loadingType}',
'${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${webStatus}','${webDate}')`
'${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${this.ulList1[i].ulList2[j].mnfBl}','${this.ulList1[i].ulList2[j].weight}',
'${this.ulList1[i].ulList2[j].volume}','${this.ulList1[i].ulList2[j].lengthType}','${this.ulList1[i].ulList2[j].pmtType}','${webStatus}','${webDate}')`
this.executeSql(sql2)
}
}
@ -1712,7 +1811,8 @@
let sql2 =
`insert into workMessageRespInfoList values('${webId2}','${this.vtpId}','${webId}','${this.ulList1[i].ulList2[j].carType}',
'${this.ulList1[i].ulList2[j].carTypeName}','${this.ulList1[i].ulList2[j].goodsNumber}','${this.ulList1[i].ulList2[j].loadingType}',
'${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${webStatus}','${webDate}')`
'${this.ulList1[i].ulList2[j].loadingTypeName}','${this.ulList1[i].ulList2[j].remark}','${this.ulList1[i].ulList2[j].mnfBl}','${this.ulList1[i].ulList2[j].weight}',
'${this.ulList1[i].ulList2[j].volume}','${this.ulList1[i].ulList2[j].lengthType}','${this.ulList1[i].ulList2[j].pmtType}','${webStatus}','${webDate}')`
this.executeSql(sql2)
}
}