|
|
@@ -23,7 +23,9 @@
|
|
|
审核处理<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item :disabled="true">请核</el-dropdown-item>
|
|
|
+ <el-dropdown-item :disabled="true">请核数据</el-dropdown-item>
|
|
|
+ <el-dropdown-item v-if="false">审核进度</el-dropdown-item>
|
|
|
+ <el-dropdown-item v-if="false">撤销请核</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<el-dropdown style="margin-right: 8px;">
|
|
|
@@ -36,12 +38,12 @@
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- @click="applySettlement('收费')">生成账单
|
|
|
+ @click.native="applySettlement('收费')">生成账单
|
|
|
</el-dropdown-item>
|
|
|
<el-dropdown-item
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- @click="applySettlement('申请')"
|
|
|
- >退款</el-dropdown-item>
|
|
|
+ @click.native="applySettlement('申请')"
|
|
|
+ >申请退款</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<el-dropdown style="margin-right: 8px;">
|
|
|
@@ -54,12 +56,12 @@
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- @click="saveSell">生成采购单
|
|
|
+ @click.native="saveSell">生成采购
|
|
|
</el-dropdown-item>
|
|
|
<el-dropdown-item
|
|
|
:disabled="detailData.seeDisabled || !this.form.id"
|
|
|
- @click="copyOrder"
|
|
|
- >复制新单</el-dropdown-item>
|
|
|
+ @click.native="copyOrder"
|
|
|
+ >复制单据</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<el-button
|
|
|
@@ -69,7 +71,7 @@
|
|
|
:loading="saveLoading"
|
|
|
size="small"
|
|
|
@click="editCustomer(false)"
|
|
|
- >{{ form.id ? '确认修改' : '确认新增' }}
|
|
|
+ >保 存
|
|
|
</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -130,6 +132,12 @@
|
|
|
<el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
|
|
|
<el-option v-for="(item,index) in paymentOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
|
|
|
</el-select>
|
|
|
+ <el-select v-else-if="item.prop === 'arrivalAddress'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled" allow-create default-first-option>
|
|
|
+ <el-option v-for="(item,index) in arrivalOptions" :key="index" :label="item.label" :value="item.label"></el-option>
|
|
|
+ </el-select>
|
|
|
+ <el-select v-else-if="item.prop === 'shippingAddress'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled" allow-create default-first-option>
|
|
|
+ <el-option v-for="(item,index) in shippingOptions" :key="index" :label="item.label" :value="item.label"></el-option>
|
|
|
+ </el-select>
|
|
|
<el-select v-else-if="item.prop === 'banks'"
|
|
|
v-model="form[item.prop]" placeholder="请选择"
|
|
|
clearable
|
|
|
@@ -167,12 +175,28 @@
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
:disabled="detailData.seeDisabled"/>
|
|
|
<el-input
|
|
|
- v-else-if="(item.prop === 'advancePayment') || (item.prop === 'orderAmount') || (item.prop === 'settlmentAmount') || (item.prop === 'overPayment')"
|
|
|
+ v-else-if="(item.prop === 'advancePayment') || (item.prop === 'orderAmount') || (item.prop === 'settlmentAmount')"
|
|
|
v-model.trim="form[item.prop]" size="small" autocomplete="off"
|
|
|
@change="computedCost"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
v-input-limit="2"
|
|
|
></el-input>
|
|
|
+ <span v-else-if="item.prop === 'overPayment'">
|
|
|
+ <el-input
|
|
|
+ v-model="form['overPayment']"
|
|
|
+ size="small"
|
|
|
+ autocomplete="off"
|
|
|
+ @change="computedCost"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ style="width: 50%"
|
|
|
+ v-input-limit="2"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="form['abc']"
|
|
|
+ size="small"
|
|
|
+ autocomplete="off"
|
|
|
+ disabled
|
|
|
+ style="width: 50%"></el-input>
|
|
|
+ </span>
|
|
|
<el-select v-else-if="item.prop === 'orderStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
|
|
|
<el-option v-for="(item,index) in statusOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
|
|
|
</el-select>
|
|
|
@@ -364,69 +388,75 @@
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</basic-container>
|
|
|
- <containerTitle title="费用明细"></containerTitle>
|
|
|
- <basic-container style="margin-bottom: 10px">
|
|
|
- <avue-crud
|
|
|
- :option="advantageProject"
|
|
|
- v-model="advantageProjectForm"
|
|
|
- :data="advantageProjectData"
|
|
|
- ref="crudProject"
|
|
|
- @row-save="rowSaveProject"
|
|
|
- @row-update="rowUpdateProject"
|
|
|
- @row-del="rowDelProject"
|
|
|
- @saveColumn="saveColumn('fees')"
|
|
|
- >
|
|
|
- <template slot="code" slot-scope="{row,index}">
|
|
|
- <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>
|
|
|
- <span>{{ row.code }}</span>
|
|
|
- </template>
|
|
|
- <template slot="corpId" slot-scope="{ row }">
|
|
|
- <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
|
|
|
- :configuration="configuration" @receiveList="receiveList"/>
|
|
|
- <span v-else>
|
|
|
- <span v-for="item in configuration.dicData" v-if="item.id == row.corpId">{{ item.cname }}</span>
|
|
|
- </span>
|
|
|
- </template>
|
|
|
- <template slot="amount" slot-scope="{ row }">
|
|
|
- <el-input v-if="row.$cellEdit" v-model.trim="row.amount"
|
|
|
- size="small" v-input-limit="2"
|
|
|
- ></el-input>
|
|
|
- <span v-else>{{ row.amount }}</span>
|
|
|
- </template>
|
|
|
- <template slot="settlmentAmount" slot-scope="{ row }">
|
|
|
- <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"
|
|
|
- size="small" v-input-limit="2"
|
|
|
- ></el-input>
|
|
|
- <span v-else>{{ row.settlmentAmount }}</span>
|
|
|
- </template>
|
|
|
- <template slot-scope="{row,index}" slot="menu">
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- size="small"
|
|
|
- @click="rowCellTwo(row,index)"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- >{{ row.$cellEdit ? '保 存' : '修 改 ' }}
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- icon="el-icon-delete"
|
|
|
- type="text"
|
|
|
- @click="rowDelProject(row, index)"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- v-if="!row.$cellEdit"
|
|
|
- >删 除</el-button>
|
|
|
- </template>
|
|
|
- <template slot="menuLeft" slot-scope="{size}">
|
|
|
- <el-button type="primary"
|
|
|
- icon="el-icon-plus"
|
|
|
- size="small"
|
|
|
- @click="costIncrease"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- >录入明细
|
|
|
- </el-button>
|
|
|
- </template>
|
|
|
- </avue-crud>
|
|
|
- </basic-container>
|
|
|
+ <fee-info
|
|
|
+ ref="feeInfo"
|
|
|
+ :orderFeesList="advantageProjectData"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ feeUrl="/blade-purchase-sales/orderfees/update"
|
|
|
+ />
|
|
|
+<!-- <containerTitle title="费用明细"></containerTitle>-->
|
|
|
+<!-- <basic-container style="margin-bottom: 10px">-->
|
|
|
+<!-- <avue-crud-->
|
|
|
+<!-- :option="advantageProject"-->
|
|
|
+<!-- v-model="advantageProjectForm"-->
|
|
|
+<!-- :data="advantageProjectData"-->
|
|
|
+<!-- ref="crudProject"-->
|
|
|
+<!-- @row-save="rowSaveProject"-->
|
|
|
+<!-- @row-update="rowUpdateProject"-->
|
|
|
+<!-- @row-del="rowDelProject"-->
|
|
|
+<!-- @saveColumn="saveColumn('fees')"-->
|
|
|
+<!-- >-->
|
|
|
+<!-- <template slot="code" slot-scope="{row,index}">-->
|
|
|
+<!-- <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>-->
|
|
|
+<!-- <span>{{ row.code }}</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="corpId" slot-scope="{ row }">-->
|
|
|
+<!-- <selectComponent v-if="row.$cellEdit" v-model="row.corpId"-->
|
|
|
+<!-- :configuration="configuration" @receiveList="receiveList"/>-->
|
|
|
+<!-- <span v-else>-->
|
|
|
+<!-- <span v-for="item in configuration.dicData" v-if="item.id == row.corpId">{{ item.cname }}</span>-->
|
|
|
+<!-- </span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="amount" slot-scope="{ row }">-->
|
|
|
+<!-- <el-input v-if="row.$cellEdit" v-model.trim="row.amount"-->
|
|
|
+<!-- size="small" v-input-limit="2"-->
|
|
|
+<!-- ></el-input>-->
|
|
|
+<!-- <span v-else>{{ row.amount }}</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="settlmentAmount" slot-scope="{ row }">-->
|
|
|
+<!-- <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"-->
|
|
|
+<!-- size="small" v-input-limit="2"-->
|
|
|
+<!-- ></el-input>-->
|
|
|
+<!-- <span v-else>{{ row.settlmentAmount }}</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot-scope="{row,index}" slot="menu">-->
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- @click="rowCellTwo(row,index)"-->
|
|
|
+<!-- :disabled="detailData.seeDisabled"-->
|
|
|
+<!-- >{{ row.$cellEdit ? '保 存' : '修 改 ' }}-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- icon="el-icon-delete"-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- @click="rowDelProject(row, index)"-->
|
|
|
+<!-- :disabled="detailData.seeDisabled"-->
|
|
|
+<!-- v-if="!row.$cellEdit"-->
|
|
|
+<!-- >删 除</el-button>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="menuLeft" slot-scope="{size}">-->
|
|
|
+<!-- <el-button type="primary"-->
|
|
|
+<!-- icon="el-icon-plus"-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- @click="costIncrease"-->
|
|
|
+<!-- :disabled="detailData.seeDisabled"-->
|
|
|
+<!-- >录入明细-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </avue-crud>-->
|
|
|
+<!-- </basic-container>-->
|
|
|
<containerTitle title="附件上传"></containerTitle>
|
|
|
<basic-container style="margin-bottom: 40px">
|
|
|
<avue-crud
|
|
|
@@ -698,6 +728,8 @@ import ApplyPayment from "../../../components/finance/applyPayment";
|
|
|
import reportDialog from "@/components/report-dialog/main";
|
|
|
import { getToken } from "@/util/auth";
|
|
|
import Cookies from 'js-cookie'
|
|
|
+import feeInfo from "@/components/fee-info/main";
|
|
|
+import {corpsAddrSelect} from "@/api/basicData/customerInformation";
|
|
|
|
|
|
export default {
|
|
|
name: "detailsPage",
|
|
|
@@ -710,6 +742,7 @@ export default {
|
|
|
customerDialog,
|
|
|
ApplyPayment,
|
|
|
reportDialog,
|
|
|
+ feeInfo,
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -1338,6 +1371,8 @@ export default {
|
|
|
giftData: [],
|
|
|
// 商品信息展示数据
|
|
|
goodsShowData: [],
|
|
|
+ arrivalOptions: [],
|
|
|
+ shippingOptions: [],
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
@@ -1512,6 +1547,7 @@ export default {
|
|
|
},
|
|
|
getcorpId(row) {
|
|
|
this.contactsData[row.index].corpId = row.id;
|
|
|
+ this.contactsData[row.index].corpName = row.cname;
|
|
|
},
|
|
|
// 采购金额获取
|
|
|
getPurchasePrice(row) {
|
|
|
@@ -1799,13 +1835,46 @@ export default {
|
|
|
this.goodsConfiguration.dicData = this.goodsConfiguration.dicData.concat(data)
|
|
|
this.removeGoodsRepeat()
|
|
|
},
|
|
|
- getCorpRow(data) {
|
|
|
+ async getCorpRow(data) {
|
|
|
+ this.arrivalOptions = [];
|
|
|
+ this.arrivalOptions = await this.corpAddr(data.id)
|
|
|
this.$set(this.form, 'paymentType', data.paymentType)
|
|
|
this.$set(this.form, 'packageRemarks', data.packageRemarks)
|
|
|
- this.$set(this.form, 'arrivalAddress', data.storageAddr)
|
|
|
+ if (this.arrivalOptions.length > 0) {
|
|
|
+ this.$set(this.form, 'arrivalAddress', this.arrivalOptions[0].label)
|
|
|
+ } else {
|
|
|
+ this.$set(this.form, 'arrivalAddress', null)
|
|
|
+ }
|
|
|
+ // if (data.storageAddr) {
|
|
|
+ // this.arrivalOptions.push({
|
|
|
+ // label: data.storageAddr
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // corpsAddrSelect({pid: data.id}).then(res => {
|
|
|
+ // if (res.data.data.records.length > 0) {
|
|
|
+ // res.data.data.records.forEach(item => {
|
|
|
+ // this.arrivalOptions.push({
|
|
|
+ // label: item.addr
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // this.$set(this.form, 'paymentType', data.paymentType)
|
|
|
+ // this.$set(this.form, 'packageRemarks', data.packageRemarks)
|
|
|
+ // if (this.arrivalOptions.length > 0) {
|
|
|
+ // this.$set(this.form, 'arrivalAddress', this.arrivalOptions[0].label)
|
|
|
+ // } else {
|
|
|
+ // this.$set(this.form, 'arrivalAddress', null)
|
|
|
+ // }
|
|
|
+ // })
|
|
|
},
|
|
|
- getPlantRow(data) {
|
|
|
- this.$set(this.form, 'shippingAddress', data.storageAddr)
|
|
|
+ async getPlantRow(data) {
|
|
|
+ this.shippingOptions = [];
|
|
|
+ this.shippingOptions = await this.corpAddr(data.id)
|
|
|
+ if (this.shippingOptions.length > 0) {
|
|
|
+ this.$set(this.form, 'shippingAddress', this.shippingOptions[0].label)
|
|
|
+ } else {
|
|
|
+ this.$set(this.form, 'shippingAddress', null)
|
|
|
+ }
|
|
|
},
|
|
|
getRow(event,row) {
|
|
|
row.priceCategory = event[0].goodsTypeName
|
|
|
@@ -1856,7 +1925,6 @@ export default {
|
|
|
// this.advantageProjectForm = this.advantageProjectForm.concat(this.tableDataCost)
|
|
|
if (this.tableDataCost.length > 0) {
|
|
|
for (let item in this.tableDataCost) {
|
|
|
- console.log(this.tableDataCost[item])
|
|
|
this.tableDataCost[item].itemId = this.tableDataCost[item].id
|
|
|
this.tableDataCost[item].feeName = this.tableDataCost[item].cname
|
|
|
this.$set(this.tableDataCost[item], 'amount', 0)
|
lichao