|
|
@@ -16,8 +16,8 @@
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item :loading="buttonLoading" @click.native="auditCheck">提交审批</el-dropdown-item>
|
|
|
- <el-dropdown-item v-if="false" @click.native="checkScheduleDialog = true">审批进度</el-dropdown-item>
|
|
|
- <el-dropdown-item v-if="false">撤销审批</el-dropdown-item>
|
|
|
+ <el-dropdown-item @click.native="checkScheduleDialog = true">审批进度</el-dropdown-item>
|
|
|
+ <el-dropdown-item disabled>撤销审批</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
|
|
|
@@ -224,11 +224,13 @@
|
|
|
<el-button type="warning" size="small" :loading="buttonLoading"
|
|
|
:disabled="selectContact.length == 0 || viewDisabled" @click="beforePage()">生成收货单
|
|
|
</el-button>
|
|
|
+ <el-button type="warning" size="small" :loading="buttonLoading" :disabled="viewDisabled"
|
|
|
+ @click="download">下载模板
|
|
|
+ </el-button>
|
|
|
<el-upload :action="baseURL" :headers="headers" :disabled="viewDisabled" :on-progress="uploading"
|
|
|
:show-file-list=false accept=".xls,.xlsx" multiple :on-success="importTemplate" :on-error="uploadError"
|
|
|
style="float: right">
|
|
|
- <el-button type="primary" size="small" icon="el-icon-upload" v-show="goodsActives == 'goods'"
|
|
|
- :disabled="detailData.seeDisabled || browse">导 入</el-button>
|
|
|
+ <el-button type="primary" size="small" icon="el-icon-upload" :disabled="viewDisabled">导 入</el-button>
|
|
|
</el-upload>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
@@ -279,7 +281,7 @@ import { isPercentage, roundNumbers } from "@/util/validate";
|
|
|
import billApplication from "@/components/bill/billApplication";
|
|
|
//商品详情接口
|
|
|
import { corpsattn } from "@/api/basicData/configuration"
|
|
|
-import { contrastObj, contrastList } from "@/util/contrastData";
|
|
|
+import { contrastObj, contrastList, contrastList2 } from "@/util/contrastData";
|
|
|
import ApplyPayment from "../../../components/finance/applyPayment";
|
|
|
import financialAccount from "../../../components/finance/financialAccount";
|
|
|
import { pleaseCheck } from "@/api/basicData/configuration"
|
|
|
@@ -312,7 +314,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- baseURL: '/api/blade-purchase-sales/orderitems/importPrice', // 商品明细上传路径
|
|
|
+ baseURL: '/api/trade-purchase/purchase-order/importPrice', // 商品明细上传路径
|
|
|
headers: { "Blade-Auth": 'Bearer ' + getToken() },
|
|
|
form: {},
|
|
|
disabled: false,
|
|
|
@@ -662,7 +664,7 @@ export default {
|
|
|
this.paymentTypeDic = res.data.data
|
|
|
})
|
|
|
this.getWorkDicts("boxModel").then(res => {
|
|
|
- this.findObject(this.customerContact.column, "cntrType").dicData =
|
|
|
+ this.findObject(this.customerContact.column, "cntrType").dicData =
|
|
|
res.data.data;
|
|
|
})
|
|
|
if (this.detailData.view) {
|
|
|
@@ -765,7 +767,7 @@ export default {
|
|
|
beforeFinance(feesData, callback) {
|
|
|
let params = {}
|
|
|
if (contrastObj(this.form, this.oldForm) || contrastList(this.contactsData, this.oldContactsData)
|
|
|
- || contrastList(feesData, this.oldFeesList) || contrastList(this.orderFilesList, this.oldFilesList)
|
|
|
+ || contrastList2(feesData, this.oldFeesList) || contrastList(this.orderFilesList, this.oldFilesList)
|
|
|
) {
|
|
|
this.$confirm("数据发生变化，请先提交保存？", {
|
|
|
confirmButtonText: "保存",
|
|
|
@@ -1183,6 +1185,10 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
+ download() {
|
|
|
+ window.open(`/api/trade-purchase/purchase-order/exportPrice?${this.website.tokenHeader
|
|
|
+ }=${getToken()}`);
|
|
|
+ },
|
|
|
copyData() {
|
|
|
if (this.verificationData()) {
|
|
|
this.takeDisabled = false
|
|
|
@@ -1272,19 +1278,23 @@ export default {
|
|
|
// 商品明细上传成功钩子
|
|
|
importTemplate(res, file) {
|
|
|
this.openFullScreen(true)
|
|
|
- if (res.data.lose.length > 0) {
|
|
|
- this.$message({
|
|
|
- showClose: true,
|
|
|
- message: '导入明细失败的大字有:' + res.data.lose.toString(),
|
|
|
- type: 'error',
|
|
|
- duration: 10000,
|
|
|
- });
|
|
|
- }
|
|
|
- res.data.list.forEach(item => {
|
|
|
-
|
|
|
+ res.data.forEach(item => {
|
|
|
+ const params = {
|
|
|
+ ...item,
|
|
|
+ price: this.form.salesPrice,
|
|
|
+ cntrNum: 1,
|
|
|
+ }
|
|
|
+ this.$refs.crudContact.rowCellAdd(params)
|
|
|
})
|
|
|
-
|
|
|
-
|
|
|
+ },
|
|
|
+ openFullScreen(res, text) {
|
|
|
+ const loading = this.$loading({
|
|
|
+ lock: true,
|
|
|
+ text: text,
|
|
|
+ spinner: 'el-icon-loading',
|
|
|
+ background: 'rgba(0, 0, 0, 0.7)'
|
|
|
+ });
|
|
|
+ if (res === true) loading.close();
|
|
|
},
|
|
|
//列保存触发
|
|
|
async saveColumn() {
|
qukaidi