|
|
@@ -93,32 +93,56 @@
|
|
|
<crop-select v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" corpType="KH"
|
|
|
:disabled="viewDisabled || takeDisabled" style="width: 100%"></crop-select>
|
|
|
<crop-select v-else-if="item.prop === 'belongToCorpId'" v-model="form[item.prop]"
|
|
|
- :disabled="viewDisabled || takeDisabled" corpType="GS"></crop-select>
|
|
|
+ :disabled="viewDisabled || takeDisabled" corpType="GS"></crop-select>
|
|
|
<user-com v-else-if="item.prop === 'salesName'" :disabled="viewDisabled || takeDisabled"
|
|
|
- v-model="form[item.prop]" style="width: 100%"></user-com>
|
|
|
+ v-model="form[item.prop]" style="width: 100%"></user-com>
|
|
|
<el-input type="age" v-else-if="item.type === 'unit'" v-model="form[item.prop]"
|
|
|
- @change="downPaymentChange" :disabled="viewDisabled || takeDisabled" size="small" autocomplete="off"
|
|
|
- placeholder="请输入">
|
|
|
+ @change="downPaymentChange" :disabled="viewDisabled || takeDisabled" size="small"
|
|
|
+ autocomplete="off"
|
|
|
+ placeholder="请输入">
|
|
|
<template slot="append">%</template>
|
|
|
</el-input>
|
|
|
<el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]"
|
|
|
- :disabled="viewDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
|
|
|
+ :disabled="viewDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
|
|
|
+ <span v-else-if="item.prop === 'srcOrderNo'" style="display:flex;width: 100%;">
|
|
|
+ <el-select v-model="form[item.prop]"
|
|
|
+ style="width: 100%;"
|
|
|
+ multiple
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ reserve-keyword
|
|
|
+ collapse-tags
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入关键词"
|
|
|
+ :disabled="viewDisabled"
|
|
|
+ :remote-method="remoteMethodTwo"
|
|
|
+ :loading="loadingTwo">
|
|
|
+ <el-option
|
|
|
+ v-for="item in options"
|
|
|
+ :key="item.sysNo"
|
|
|
+ :label="item.orderNo"
|
|
|
+ :value="item.sysNo">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ <el-button icon="el-icon-search" :disabled="viewDisabled" size="mini"
|
|
|
+ @click.stop="dialogVisible = true"></el-button>
|
|
|
+ </span>
|
|
|
<el-select v-else-if="item.prop === 'orderType'" style="width: 100%" v-model="form[item.prop]"
|
|
|
- :disabled="viewDisabled" size="small" placeholder="请选择" clearable filterable>
|
|
|
+ :disabled="viewDisabled" size="small" placeholder="请选择" clearable filterable>
|
|
|
<el-option v-for="(item, index) in contractTypeDic" :key="index" :label="item.dictValue"
|
|
|
- :value="item.dictValue"></el-option>
|
|
|
+ :value="item.dictValue"></el-option>
|
|
|
</el-select>
|
|
|
<el-input type="age" v-else v-model="form[item.prop]" size="small"
|
|
|
- :disabled="item.disabled ? true : false || viewDisabled" autocomplete="off" placeholder="请输入">
|
|
|
+ :disabled="item.disabled ? true : false || viewDisabled" autocomplete="off"
|
|
|
+ placeholder="请输入">
|
|
|
</el-input>
|
|
|
-
|
|
|
<template slot="label" v-if="item.prop === 'corpId'">
|
|
|
<e-crop-jump :label="item.label" corp-type="KH"></e-crop-jump>
|
|
|
</template>
|
|
|
<template slot="label" v-if="item.prop === 'belongToCorpId'">
|
|
|
<e-crop-jump :label="item.label" corp-type="GS"></e-crop-jump>
|
|
|
</template>
|
|
|
-
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -272,15 +296,39 @@
|
|
|
</bill-application>
|
|
|
</el-dialog>
|
|
|
<el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
|
|
|
- :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
+ :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
<check-schedule :checkId="form.id" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
|
|
|
</check-schedule>
|
|
|
</el-dialog>
|
|
|
<el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
|
|
|
- :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
+ :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
<check :checkData="detailData.check" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">
|
|
|
</check>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ title="选择采购"
|
|
|
+ :visible.sync="dialogVisible"
|
|
|
+ v-if="dialogVisible"
|
|
|
+ append-to-body
|
|
|
+ class="el-dialogDeep"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ v-dialog-drag
|
|
|
+ width="70%">
|
|
|
+ <span>
|
|
|
+ <avue-crud :option="option" :data="dataList" :search.sync="search" @on-load="onLoad" :page.sync="pageTwo" @search-change="searchChange" @selection-change="selectionChange">
|
|
|
+ <template slot="corpIdSearch">
|
|
|
+ <select-component v-model="search.corpId" :configuration="configuration"></select-component>
|
|
|
+ </template>
|
|
|
+ <template slot="corpId" slot-scope="{row}">
|
|
|
+ {{row.strCorpName}}
|
|
|
+ </template>
|
|
|
+ </avue-crud>
|
|
|
+ </span>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button size="small" @click="dialogVisible = false">取 消</el-button>
|
|
|
+ <el-button type="primary" size="small" @click="confirmAdding">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -307,7 +355,8 @@ import checkSchedule from "../../../components/check/checkSchedule";
|
|
|
import check from "@/components/check/check";
|
|
|
import { pleaseCheck } from "@/api/basicData/configuration"
|
|
|
import { getParities } from "@/api/basicData/customerInquiry";
|
|
|
-import { dateFormat } from "@/util/date";
|
|
|
+import {dateFormat} from "@/util/date";
|
|
|
+import {selectPurchaseList,selectPurchaseListAll} from "@/api/importTrade/purchase";
|
|
|
|
|
|
export default {
|
|
|
name: "detailsPage",
|
|
|
@@ -335,8 +384,62 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ search:{},
|
|
|
+ configuration: {
|
|
|
+ multipleChoices: false,
|
|
|
+ multiple: false,
|
|
|
+ disabled: false,
|
|
|
+ searchShow: true,
|
|
|
+ collapseTags: false,
|
|
|
+ clearable: true,
|
|
|
+ placeholder: '请点击右边按钮选择',
|
|
|
+ dicData: []
|
|
|
+ },
|
|
|
+ option: {
|
|
|
+ menu:false,
|
|
|
+ addBtn:false,
|
|
|
+ columnBtn:false,
|
|
|
+ selection:true,
|
|
|
+ reserveSelection:true,
|
|
|
+ searchMenuSpan:8,
|
|
|
+ searchSpan: 8,
|
|
|
+ align: "center",
|
|
|
+ searchMenuPosition: "right",
|
|
|
+ column: [{
|
|
|
+ label: '合同日期',
|
|
|
+ prop: "businesDate",
|
|
|
+ type: "date",
|
|
|
+ format: "yyyy-MM-dd",
|
|
|
+ valueFormat: "yyyy-MM-dd",
|
|
|
+ unlinkPanels: true,
|
|
|
+ searchRange: true,
|
|
|
+ search: true,
|
|
|
+ overHidden: true,
|
|
|
+ },{
|
|
|
+ label: '合同号',
|
|
|
+ prop: 'orderNo'
|
|
|
+ },{
|
|
|
+ label: '采购订单号',
|
|
|
+ prop: 'sysNo'
|
|
|
+ },{
|
|
|
+ label: '供应商',
|
|
|
+ prop: 'corpId',
|
|
|
+ search: true,
|
|
|
+ overHidden: true,
|
|
|
+ },{
|
|
|
+ label: '合同金额',
|
|
|
+ prop: 'orderAmount'
|
|
|
+ },{
|
|
|
+ label: '码单重量(吨)',
|
|
|
+ prop: 'billWeight'
|
|
|
+ }]
|
|
|
+ },
|
|
|
+ dataList:[],
|
|
|
+ dialogVisible: false,
|
|
|
+ options: [],
|
|
|
contractTypeDic: [],
|
|
|
loading: false,
|
|
|
+ loadingTwo: false,
|
|
|
disabled: false,
|
|
|
buttonLoading: false,
|
|
|
dialogCommodity: false,
|
|
|
@@ -358,6 +461,7 @@ export default {
|
|
|
currencyDic: [],
|
|
|
srcSysNoDic: [],
|
|
|
contractDic: [],
|
|
|
+ selectionList: [],
|
|
|
selectKind: -1,
|
|
|
billUrl: "",
|
|
|
billType: "",
|
|
|
@@ -587,7 +691,7 @@ export default {
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
- label: '采购单号',
|
|
|
+ label: '采购合同号',
|
|
|
prop: 'srcOrderNo',
|
|
|
disabled: true,
|
|
|
rules: [
|
|
|
@@ -617,6 +721,11 @@ export default {
|
|
|
currentPage: 1,
|
|
|
total: 0
|
|
|
},
|
|
|
+ pageTwo: {
|
|
|
+ pageSize: 10,
|
|
|
+ currentPage: 1,
|
|
|
+ total: 0
|
|
|
+ },
|
|
|
// 导入库存配置
|
|
|
importInventory: {},
|
|
|
importInventoryForm: {},
|
|
|
@@ -636,7 +745,8 @@ export default {
|
|
|
this.getWorkDicts("currency").then(res => {
|
|
|
this.currencyDic = res.data.data
|
|
|
})
|
|
|
- selectCG().then(res=>{
|
|
|
+ this.remoteMethodTwo()
|
|
|
+ selectCG().then(res => {
|
|
|
this.srcSysNoDic = res.data.data.records
|
|
|
})
|
|
|
if (this.detailData.view) {
|
|
|
@@ -685,19 +795,95 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
|
+ confirmAdding(){
|
|
|
+ this.selectionList.forEach(item=>{
|
|
|
+ this.form.srcOrderNo.push(item.sysNo)
|
|
|
+ })
|
|
|
+ this.form.srcOrderNo = this.form.srcOrderNo.filter((item, index, array) => {
|
|
|
+ return array.indexOf(item) === index
|
|
|
+ })
|
|
|
+ this.dialogVisible = false
|
|
|
+ },
|
|
|
+ onLoad(page, params) {
|
|
|
+ this.loading = true
|
|
|
+ params = this.paramsAdjustment(params)
|
|
|
+ params.size = page.pageSize
|
|
|
+ params.current = page.currentPage
|
|
|
+ params.tradeType = "JK" //进口参数
|
|
|
+ selectPurchaseList(params).then(res => {
|
|
|
+ this.dataList = res.data.data.records
|
|
|
+ this.pageTwo.total = res.data.data.total
|
|
|
+ }).finally(() => {
|
|
|
+ this.loading = false
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //点击搜索按钮触发
|
|
|
+ searchChange(params, done) {
|
|
|
+ this.pageTwo.currentPage = 1;
|
|
|
+ this.onLoad(this.pageTwo, params);
|
|
|
+ done()
|
|
|
+ },
|
|
|
+ selectionChange(list){
|
|
|
+ this.selectionList = list
|
|
|
+ },
|
|
|
+ paramsAdjustment(params) {
|
|
|
+ params = Object.assign({}, this.search);
|
|
|
+ if (params.businesDate && params.businesDate.length != 0) { //合同
|
|
|
+ params.businesStartDate = params.businesDate[0] + " " + "00:00:00";
|
|
|
+ params.businesEndDate = params.businesDate[1] + " " + "23:59:59";
|
|
|
+ this.$delete(params, 'businesDate')
|
|
|
+ }
|
|
|
+ if (params.requiredDeliveryDate && params.requiredDeliveryDate.length != 0) { //发货
|
|
|
+ params.requiredDeliveryStartDate = params.requiredDeliveryDate[0] + " " + "00:00:00";
|
|
|
+ params.requiredDeliveryEndDate = params.requiredDeliveryDate[1] + " " + "23:59:59";
|
|
|
+ this.$delete(params, 'requiredDeliveryDate')
|
|
|
+ }
|
|
|
+ if (params.requiredArrivalDate && params.requiredArrivalDate.length != 0) { //到货
|
|
|
+ params.requiredArrivalStartDate = params.requiredArrivalDate[0] + " " + "00:00:00";
|
|
|
+ params.requiredArrivalEndDate = params.requiredArrivalDate[1] + " " + "23:59:59";
|
|
|
+ this.$delete(params, 'requiredArrivalDate')
|
|
|
+ }
|
|
|
+ if (params.accountsCollectionDate && params.accountsCollectionDate.length != 0) { //付款
|
|
|
+ params.accountsCollectionStartDate = params.accountsCollectionDate[0] + " " + "00:00:00";
|
|
|
+ params.accountsCollectionEndDate = params.accountsCollectionDate[1] + " " + "23:59:59";
|
|
|
+ this.$delete(params, 'accountsCollectionDate')
|
|
|
+ }
|
|
|
+ if (params.dateOfArrival && params.dateOfArrival.length != 0) { //到港
|
|
|
+ params.dateOfStartArrival = params.dateOfArrival[0] + " " + "00:00:00";
|
|
|
+ params.dateOfEndArrival = params.dateOfArrival[1] + " " + "23:59:59";
|
|
|
+ this.$delete(params, 'dateOfArrival')
|
|
|
+ }
|
|
|
+ if (params.creditDate && params.creditDate.length != 0) { //信用
|
|
|
+ params.creditStartDate = params.creditDate[0] + " " + "00:00:00";
|
|
|
+ params.creditEndDate = params.creditDate[1] + " " + "23:59:59";
|
|
|
+ this.$delete(params, 'creditDate')
|
|
|
+ }
|
|
|
+ return params
|
|
|
+ },
|
|
|
remoteMethod(query) {
|
|
|
if (query !== '') {
|
|
|
this.loading = true;
|
|
|
- selectCG({srcSysNo:query}).then(res=>{
|
|
|
+ selectCG({srcSysNo: query}).then(res => {
|
|
|
this.srcSysNoDic = res.data.data.records
|
|
|
this.loading = false;
|
|
|
})
|
|
|
} else {
|
|
|
- selectCG().then(res=>{
|
|
|
+ selectCG().then(res => {
|
|
|
this.srcSysNoDic = res.data.data.records
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
+ remoteMethodTwo(query) {
|
|
|
+ this.loading = true;
|
|
|
+ selectPurchaseListAll({
|
|
|
+ tradeType: "JK",
|
|
|
+ orderType: "橡胶",
|
|
|
+ sysNo: query
|
|
|
+ }).then(res => {
|
|
|
+ this.loading = false;
|
|
|
+ this.options = res.data.data
|
|
|
+ })
|
|
|
+ },
|
|
|
valueName(value, row) {
|
|
|
this.$set(row, "priceCategory", value.id)
|
|
|
},
|
|
|
@@ -1015,6 +1201,7 @@ export default {
|
|
|
orderItemsList: this.importInventoryData,
|
|
|
orderFeesList: orderFeesList,
|
|
|
orderUpLoadList: orderUpLoadList,
|
|
|
+ srcOrderNo: this.form.srcOrderNo.join(',')
|
|
|
};
|
|
|
|
|
|
submitData(submitDto).then(res => {
|
|
|
@@ -1038,6 +1225,7 @@ export default {
|
|
|
},
|
|
|
afterEcho(data) {
|
|
|
this.form = data;
|
|
|
+ this.form.srcOrderNo = this.form.srcOrderNo.split(',')
|
|
|
this.oldForm = Object.assign({}, data);
|
|
|
this.importInventoryData = data.orderItemsList
|
|
|
|
caojunjie