From 8dc474768e47ecfcb2f590e7d5c704b46f7a612a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 16:10:39 +0800
Subject: [PATCH] modified: src/api/plan/customerorder.js modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: vue.config.js
---
vue.config.js | 2 +-
src/views/plan/customerorder/index.vue | 4 ++--
src/api/plan/customerorder.js | 5 +++--
src/views/plan/customerorder/sample-customerorder-form.vue | 21 ++++++++++++++++++++-
src/views/plan/customerorder/schedule-table.vue | 4 ++--
5 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/api/plan/customerorder.js b/src/api/plan/customerorder.js
index 0438b62..21670b2 100644
--- a/src/api/plan/customerorder.js
+++ b/src/api/plan/customerorder.js
@@ -391,7 +391,8 @@
// 浣滃簾
export function dropByContractNo(contractNo) {
return request({
- url: '/mes/plan/customerOrder/dropByContractNo/' + contractNo,
- method: 'get'
+ url: '/mes/plan/customerOrder/dropByContractNo',
+ method: 'get',
+ params: contractNo
})
}
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 03bd22c..7151b17 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -1186,13 +1186,13 @@
},
// 浣滃簾
cancelHandle(row) {
- this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.customerOrderNo + '鎻愮ず', {
+ this.$confirm('纭浣滃簾閿�鍞鍗曞彿涓恒��' + row.contractNo + '銆戠殑鏁版嵁?','鎻愮ず' , {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
type: 'warning'
}).then(() => {
- dropByContractNo(row.customerOrderNo).then((res) => {
+ dropByContractNo({contractNo:row.contractNo}).then((res) => {
if (res.data.code === 0) {
this.$message.success('浣滃簾鎴愬姛')
this.getData()
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index c4aa3ea..9c069b0 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -406,7 +406,6 @@
import { addObj } from '@/api/plan/customer'
import { remote } from '@/api/admin/dict'
import PartDialog from '@/views/common/part.vue'
-import { validateSixDecimal } from '@/util/validate'
import {dateFormat} from '@/util/date'
import { chooseStaff } from '@/api/admin/productType'
import { tableOption } from '@/const/crud/customerOrder/customerOrderForm'
@@ -415,6 +414,26 @@
components: {
PartDialog
},
+ watch:{
+ visible(newVal){
+ if(!newVal){
+ this.tableData = [{
+ "$cellEdit": true,
+ "$index": 0,
+ "partNo": "",
+ "customerPartSpec": "",
+ "manufactureAttr": "",
+ "productName": "",
+ "productType": "",
+ "otcUnit": "",
+ "buyQtyDue": "",
+ "shippingAddress": "",
+ "remark": "",
+ "isTrusted": true
+ }]
+ }
+ }
+ },
data() {
return {
salesSelectData: null,
diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index 7cbc453..04a66bb 100644
--- a/src/views/plan/customerorder/schedule-table.vue
+++ b/src/views/plan/customerorder/schedule-table.vue
@@ -67,7 +67,7 @@
<el-form-item>{{ scope.row.buyQtyDue }}</el-form-item>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
header-align="center"
align="center"
label="宸茶鍒掓暟閲�"
@@ -76,7 +76,7 @@
<template slot-scope="scope">
<el-form-item>{{ scope.row.requireNumber }}</el-form-item>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="remainderRequired"
header-align="center"
diff --git a/vue.config.js b/vue.config.js
index 204c9ea..866bbb4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,7 +4,7 @@
*/
// const url = 'http://192.168.0.23:9999'
- const url = 'http://192.168.0.60:9999'
+ const url = 'http://192.168.0.23:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3