From 5ff704af11fc13dd48a48e133652faf1e13d178d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 19:21:32 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/customerorder/index.vue | 19 +--------
src/const/crud/customerOrder/customerOrderForm.js | 7 ---
src/views/plan/masterproductionschedule/auto-manufacturingorder.vue | 2
src/api/plan/customerorder.js | 12 +++++-
src/views/plan/customerorder/sample-customerorder-form.vue | 23 +++++++----
src/views/plan/customerorder/customerorder-form.vue | 4 +-
6 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/src/api/plan/customerorder.js b/src/api/plan/customerorder.js
index a88f999..97b45a2 100644
--- a/src/api/plan/customerorder.js
+++ b/src/api/plan/customerorder.js
@@ -383,7 +383,15 @@
// 浣滃簾
export function dropByContractNo(contractNo) {
return request({
- url: '/mes/plan/customerOrder/dropByContractNo/' + contractNo,
- method: 'get'
+ url: '/mes/plan/customerOrder/dropByContractNo',
+ method: 'get',
+ params: contractNo
+ })
+}
+
+export function chooseStaff() {
+ return request({
+ url: '/mes/plan/customerOrder/chooseStaff',
+ method: 'get',
})
}
diff --git a/src/const/crud/customerOrder/customerOrderForm.js b/src/const/crud/customerOrder/customerOrderForm.js
index 8f0e9b8..05e9d01 100644
--- a/src/const/crud/customerOrder/customerOrderForm.js
+++ b/src/const/crud/customerOrder/customerOrderForm.js
@@ -69,13 +69,6 @@
minWidth: 200,
span: 24
}, {
- label: '闅跺睘鍝佺墝',
- prop: 'productType',
- cell: true,
- type: 'input',
- minWidth: 200,
- span: 24
- }, {
label: '鍗曚綅',
prop: 'otcUnit',
slot: true,
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index c36e379..3002f0a 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -156,12 +156,12 @@
placeholder=""
disabled
>
- <el-button
+ <!-- <el-button
slot="append"
icon="el-icon-search"
@click="openSalesPartDialog()"
v-show="dataForm.id"
- ></el-button>
+ ></el-button> -->
</el-input>
</el-form-item>
</el-col>
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 2dba483..1c1af1d 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -1113,7 +1113,7 @@
},
// 浣滃簾
cancelHandle(row) {
- this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.id + '鎻愮ず', {
+ this.$confirm('纭浣滃簾閿�鍞鍗曞彿涓恒��' + row.contractNo + '銆戠殑鏁版嵁?','鎻愮ず' , {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
@@ -1127,22 +1127,7 @@
this.$message.error('浣滃簾澶辫触')
}
})
- })
- // .then(() => {
- // markPlanned([row.id], '05cancel').then((response) => {
- // var data = response.data
- // if (data.code === 0) {
- // this.$message.success('浣滃簾鎴愬姛')
- // this.getData()
- // } else {
- // this.$message.error('浣滃簾澶辫触')
- // }
- // })
- // })
- // .then((data) => {
- // this.$message.success('浣滃簾鎴愬姛')
- // this.getData()
- // })
+ }).catch(()=>{ })
},
// 鍒犻櫎
deleteHandle(row) {
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 04fded5..f409eae 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -68,8 +68,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="涓氬姟鍛�" prop="salesMan">
- <el-select @change="selsctionSales" v-model="salesSelectData" style="width:100%">
- <el-option v-for="(item,index) in staffOptions" :key="index" :value="item" :label="item.staffName"/>
+ <el-select @change="selsctionSales" filterable v-model="salesSelectData" style="width:100%">
+ <el-option v-for="(item,index) in staffOptions" :key="index" :value="item.staffNo+','+item.staffName" :label="item.staffName"/>
</el-select>
</el-form-item>
</el-col>
@@ -391,7 +391,7 @@
import PartDialog from '@/views/common/part.vue'
import { validateSixDecimal } from '@/util/validate'
import {dateFormat} from '@/util/date'
-// import { chooseStaff } from '@/api/admin/productType'
+import { chooseStaff } from '@/api/plan/customerorder'
import { tableOption } from '@/const/crud/customerOrder/customerOrderForm'
export default {
@@ -477,13 +477,16 @@
this.tableData.splice(index,1)
},
selsctionSales(data){
- this.dataForm.salesMan = data.staffName
- this.dataForm.salerWorkCode = data.staffNo
+ if(data){
+ let arr = data.split(",")
+ this.dataForm.salesMan = arr[1]
+ this.dataForm.salerWorkCode = arr[0]
+ }
},
getStaffOptions(){
- // chooseStaff().then((response)=>{
- // this.staffOptions = response.data.data
- // })
+ chooseStaff().then((response)=>{
+ this.staffOptions = response.data.data
+ })
},
init(id) {
this.initDataForm()
@@ -555,6 +558,10 @@
this.tableData[index].partNo = part.partNo
this.tableData[index].customerPartSpec = part.specs
this.tableData[index].productName = part.partName
+ this.tableData[index].otcUnit = part.unit
+ this.tableData[index].buyQtyDue = part.numCount
+ this.tableData[index].manufactureAttr = part.materialAttribute
+
}
},
// 鍏ㄥ睆
diff --git a/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue b/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
index fab06e0..d99014c 100644
--- a/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
+++ b/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
@@ -251,7 +251,7 @@
unit: item.unit,
workShop: null,
workshopTypeCode: 'M',
- requiredDate: null,
+ requiredDate: this.masterProduction.requiredDate,
id: item.id,
manufactureAttr: this.masterProduction.manufactureAttr,
isReportOperation: this.isReportOperation
--
Gitblit v1.9.3