|
|
@@ -26,7 +26,7 @@
|
|
|
size="small"
|
|
|
v-if="form.deliveryStatus !== '录入'"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- >撤销收货</el-button>
|
|
|
+ >撤销发货</el-button>
|
|
|
<el-button
|
|
|
class="el-button--small-yh"
|
|
|
type="primary"
|
|
|
@@ -34,7 +34,7 @@
|
|
|
size="small"
|
|
|
v-if="form.deliveryStatus == '录入'"
|
|
|
:disabled="detailData.seeDisabled || !this.form.id"
|
|
|
- >确认收货</el-button>
|
|
|
+ >确认发货</el-button>
|
|
|
<el-button
|
|
|
class="el-button--small-yh"
|
|
|
size="small"
|
|
|
@@ -103,6 +103,14 @@
|
|
|
:disabled="detailData.seeDisabled || receiveDisabled">
|
|
|
<el-option v-for="(item,index) in GYSInfo" :key="index" :label="item.addr" :value="item.addr"></el-option>
|
|
|
</el-select>
|
|
|
+ <el-radio-group v-else-if="item.prop === 'logisticsConfirm'" v-model="form[item.prop]" :disabled="detailData.seeDisabled || receiveDisabled" @change="logisticsConfirmChange">
|
|
|
+ <el-radio label="1">是</el-radio>
|
|
|
+ <el-radio label="0">否</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ <el-radio-group v-else-if="item.prop === 'assistantConfirm'" v-model="form[item.prop]" :disabled="detailData.seeDisabled || receiveDisabled" @change="assistantConfirmChange">
|
|
|
+ <el-radio label="1">是</el-radio>
|
|
|
+ <el-radio label="0">否</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
<warehouse-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]"
|
|
|
:configuration="configurationWarehouse" style="width: 100%" :disabled="detailData.seeDisabled || receiveDisabled"/>
|
|
|
<el-input
|
|
|
@@ -133,10 +141,10 @@
|
|
|
@saveColumn="saveColumn('goods')"
|
|
|
@resetColumn="resetColumn"
|
|
|
>
|
|
|
- <template slot="headerSerial" slot-scope="{column}">
|
|
|
+ <template slot="headerSerial">
|
|
|
<el-button type="primary" icon="el-icon-circle-plus-outline" circle size="mini" @click="$refs.crudContact.rowCellAdd()"></el-button>
|
|
|
</template>
|
|
|
- <template slot="code" slot-scope="{row,index}">
|
|
|
+ <template slot="code" slot-scope="{row}">
|
|
|
<el-button type="text" size="mini" style="padding:4px 10px;float:left" :disabled="detailData.seeDisabled || !row.$cellEdit" @click="commodityChoice(row)">选择</el-button>
|
|
|
<span>{{ row.code }}</span>
|
|
|
</template>
|
|
|
@@ -194,7 +202,7 @@
|
|
|
@beforeFinance="beforeFinance"
|
|
|
:srcType="3"
|
|
|
optionType="GN"
|
|
|
- itemType="收货"
|
|
|
+ itemType="发货"
|
|
|
feeUrl="/blade-deliver-goods/deliveryfees/update"
|
|
|
:corpId="form.corpId"
|
|
|
/>
|
|
|
@@ -329,7 +337,7 @@ import {
|
|
|
} from "@/util/validate";
|
|
|
import {detail as GYSDetail} from "@/api/basicData/customerInformation";
|
|
|
import { getMarketPrice, getPurchasePrice } from "@/api/basicData/fees";
|
|
|
-
|
|
|
+import { dateFormat } from "@/util/date";
|
|
|
export default {
|
|
|
name: "detailsPage",
|
|
|
props: {
|
|
|
@@ -612,7 +620,36 @@ export default {
|
|
|
trigger: 'blur'
|
|
|
}
|
|
|
]
|
|
|
- },{
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "物流确认",
|
|
|
+ prop: "logisticsConfirm",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "操作人",
|
|
|
+ prop: "logisticsConfirmUser",
|
|
|
+ disabled:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "操作时间",
|
|
|
+ prop: "logisticsConfirmTime",
|
|
|
+ disabled:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "助理确认",
|
|
|
+ prop: "assistantConfirm",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "操作人",
|
|
|
+ prop: "assistantConfirmUser",
|
|
|
+ disabled:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "操作时间",
|
|
|
+ prop: "assistantConfirmTime",
|
|
|
+ disabled:true
|
|
|
+ },
|
|
|
+ {
|
|
|
label: "入库单备注",
|
|
|
span: 24,
|
|
|
type: 'textarea',
|
|
|
@@ -645,7 +682,7 @@ export default {
|
|
|
rowHeight: '',
|
|
|
// 查询时loading页面
|
|
|
pageLoading: false,
|
|
|
- // 收货禁用
|
|
|
+ // 发货禁用
|
|
|
receiveDisabled: false,
|
|
|
messageVisble:false,
|
|
|
GYSInfo: [], //供应商发货方信息
|
|
|
@@ -1013,6 +1050,24 @@ export default {
|
|
|
this.treeDeptIdCost = "";
|
|
|
this.treeData = [];
|
|
|
},
|
|
|
+ logisticsConfirmChange(row){
|
|
|
+ if(row==1){
|
|
|
+ this.$set(this.form, 'logisticsConfirmUser',localStorage.getItem("roleName"))
|
|
|
+ this.$set(this.form, 'logisticsConfirmTime',dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss"))
|
|
|
+ }else{
|
|
|
+ this.$set(this.form, 'logisticsConfirmUser',null)
|
|
|
+ this.$set(this.form, 'logisticsConfirmTime',null)
|
|
|
+ }
|
|
|
+ },
|
|
|
+ assistantConfirmChange(row){
|
|
|
+ if(row==1){
|
|
|
+ this.$set(this.form, 'assistantConfirmUser',localStorage.getItem("roleName"))
|
|
|
+ this.$set(this.form, 'assistantConfirmTime',dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss"))
|
|
|
+ }else{
|
|
|
+ this.$set(this.form, 'assistantConfirmUser',null)
|
|
|
+ this.$set(this.form, 'assistantConfirmTime',null)
|
|
|
+ }
|
|
|
+ },
|
|
|
//选中触发
|
|
|
selectionChange(list) {
|
|
|
console.log(list);
|
|
|
@@ -1166,7 +1221,7 @@ export default {
|
|
|
this.configuration.dicData = this.configuration.dicData.concat(data)
|
|
|
this.removeRepeat()
|
|
|
},
|
|
|
- // 确认收货
|
|
|
+ // 确认发货
|
|
|
sendInGoods() {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
@@ -1183,7 +1238,7 @@ export default {
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
}).then(async () => {
|
|
|
- await this.editCustomer(false, '收货')
|
|
|
+ await this.editCustomer(false, '发货')
|
|
|
}).catch(() => {
|
|
|
this.$message.info('已取消')
|
|
|
})
|
|
|
@@ -1197,7 +1252,7 @@ export default {
|
|
|
}
|
|
|
this.pageLoading = true
|
|
|
sendInGoods(this.form).then(res => {
|
|
|
- this.$message.success('收货成功')
|
|
|
+ this.$message.success('发货成功')
|
|
|
this.queryData(res.data.data.id)
|
|
|
}).finally(() => {
|
|
|
this.pageLoading = false
|
|
|
@@ -1208,7 +1263,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- // 撤销收货
|
|
|
+ // 撤销发货
|
|
|
revokeInGoods() {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
@@ -1265,7 +1320,7 @@ export default {
|
|
|
} else {
|
|
|
this.queryData(res.data.data.id)
|
|
|
}
|
|
|
- if (type == '收货') {
|
|
|
+ if (type == '发货') {
|
|
|
this.$nextTick(() => {
|
|
|
this.form.deliveryItemsList = this.contactsData
|
|
|
this.form.deliveryFeesList = this.advantageProjectData
|
|
|
@@ -1275,7 +1330,7 @@ export default {
|
|
|
}
|
|
|
this.pageLoading = true
|
|
|
sendInGoods(this.form).then(res => {
|
|
|
- this.$message.success('收货成功')
|
|
|
+ this.$message.success('发货成功')
|
|
|
this.queryData(res.data.data.id)
|
|
|
}).finally(() => {
|
|
|
this.pageLoading = false
|
QuKatie