From 2518e47a3ac999978fbf14612c967c3bbf421d25 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 十一月 2023 13:31:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/basic/log/index.vue | 1
src/views/plan/customerorder/index.vue | 23 +----
src/const/crud/customerOrder/customerOrderForm.js | 7 -
src/views/plan/customerorder/schedule-table.vue | 10 +
src/views/plan/customerorder/customerorder-form.vue | 50 ++++++++----
src/views/quality/report/index.vue | 3
src/views/plan/masterproductionschedule/index.vue | 66 ++++++++--------
src/views/plan/manufacturingorder/index.vue | 2
src/views/plan/mpsrequirements/index.vue | 1
src/views/plan/masterproductionschedule/auto-manufacturingorder.vue | 2
src/api/plan/customerorder.js | 20 ++++
src/views/plan/customerorder/sample-customerorder-form.vue | 23 +++--
src/views/plan/operationtask/index.vue | 1
src/views/plan/outsourcingorder/index.vue | 8 +-
14 files changed, 122 insertions(+), 95 deletions(-)
diff --git a/src/api/plan/customerorder.js b/src/api/plan/customerorder.js
index a88f999..b27f4e0 100644
--- a/src/api/plan/customerorder.js
+++ b/src/api/plan/customerorder.js
@@ -383,7 +383,23 @@
// 浣滃簾
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',
+ })
+}
+
+export function updateCustomerOrderById(obj) {
+ return request({
+ url: '/mes/plan/customerOrder/updateById',
+ method: 'put',
+ data: obj
+ })
+}
\ No newline at end of file
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/basic/log/index.vue b/src/views/basic/log/index.vue
index 9bca672..11505e4 100644
--- a/src/views/basic/log/index.vue
+++ b/src/views/basic/log/index.vue
@@ -35,6 +35,7 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="item"
:command="item.command"
v-for="item in documentTagArr"
:disabled="item.disabled"
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index c36e379..97c47e0 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -71,9 +71,9 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="returnStatus">
+ <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="coState">
<el-input
- v-model="dataForm.returnStatus"
+ v-model="dataForm.coState"
placeholder=""
filterable
style="width: 100%"
@@ -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>
@@ -909,6 +909,13 @@
)
}
}
+ let val=""
+ this.coStates.forEach(item=>{
+ if(item.value==this.dataForm.coState){
+ val=item.label
+ }
+ })
+ this.dataForm.coState=val
})
} else {
this.title = '鏂板'
@@ -916,6 +923,7 @@
}
})
},
+
getFileList() {
this.fileList = []
const queryParam = { orderNumber: this.dataForm.contractNo }
@@ -972,25 +980,21 @@
this.$refs.dataForm.validate((valid) => {
if (valid) {
if (this.dataForm.id) {
- updateCustomerOrderById(this.dataForm)
- .then((data) => {
+ updateCustomerOrderById(this.dataForm).then((data) => {
this.$message.success('淇敼鎴愬姛')
this.visible = false
this.buttonDisable = false
this.$emit('refreshDataList', 1)
- })
- .catch((error) => {
+ }).catch((error) => {
this.buttonDisable = false
})
} else {
- addCustomerOrder(this.dataForm)
- .then((data) => {
+ addCustomerOrder(this.dataForm).then((data) => {
this.$message.success('娣诲姞鎴愬姛')
this.visible = false
this.buttonDisable = false
this.$emit('refreshDataList', 1)
- })
- .catch((error) => {
+ }).catch((error) => {
this.buttonDisable = false
})
}
@@ -1099,10 +1103,23 @@
this.getConfigFiles()
},
delProcessConfigFile(row) {
- if (row.lineNumber !== this.dataForm.otcLineNo) {
- this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
- } else {
- this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
+ // if (row.lineNumber !== this.dataForm.otcLineNo) {
+ // this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
+ // } else {
+ // this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // type: 'warning',
+ // closeOnClickModal: false
+ // })
+ // .then(function() {
+ // return deleteProcessConfigFile(row.id)
+ // })
+ // .then((data) => {
+ // this.getConfigFiles()
+ // })
+ // }
+ this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
@@ -1114,7 +1131,6 @@
.then((data) => {
this.getConfigFiles()
})
- }
},
downloadProcessConfigFile(row) {
downloadProcessConfigFile(
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 3627cd5..1c1af1d 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -445,7 +445,7 @@
{
minWidth: '100',
width: '100px',
- prop: 'customerOrderNo',
+ prop: 'contractNo',
label: '鍚堝悓缂栧彿',
sort: true,
isTrue: true,
@@ -841,7 +841,7 @@
}
if (this.permissions.customerorder_submit_oa) {
this.table.toolbar.push({
- text: '鎻愪氦瀹℃牳',
+ text: '鎻愪氦OA瀹℃牳',
type: 'primary',
fun: this.auditCustomerOrder,
disabled: false,
@@ -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/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index d0aec79..0f60dab 100644
--- a/src/views/plan/customerorder/schedule-table.vue
+++ b/src/views/plan/customerorder/schedule-table.vue
@@ -84,15 +84,16 @@
label="鏈璁″垝鏁伴噺"
>
<template scope="scope">
- <el-form-item
+ <el-form-item>{{ scope.row.qtyPlaned }}</el-form-item>
+ <!-- <el-form-item
:prop="'customer.' + scope.$index"
:rules="rules.qtyPlaned"
>
<el-input
v-model="scope.row.qtyPlaned"
placeholder="璇疯緭鍏ユ湰娆¤鍒掓暟閲�"
- ></el-input>
- </el-form-item>
+ ></el-input> -->
+ <!-- </el-form-item> -->
</template>
</el-table-column>
<el-table-column
@@ -224,6 +225,9 @@
customerList.push(item)
})
this.dataForm.customer = JSON.parse(JSON.stringify(customerList))
+ this.dataForm.customer.forEach(item=>{
+ item.qtyPlaned=item.buyQtyDue
+ })
})
},
dataFormSubmit() {
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 8242121..2f08f2a 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -22,6 +22,7 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="item"
:command="item.command"
v-for="item in taskTypeArr"
:disabled="canCreateTask"
@@ -40,6 +41,7 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="item"
:command="item.command"
v-for="item in stateTagArr"
:disabled="item.disabled"
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
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index e46dfa5..a738b08 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -9,7 +9,7 @@
杞﹂棿璁㈠崟<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item :command="item.command" v-for="item in orderTypeArr" :disabled="item.disabled">{{
+ <el-dropdown-item :key="item" :command="item.command" v-for="item in orderTypeArr" :disabled="item.disabled">{{
item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -20,7 +20,7 @@
鐘舵�佹敼鍙�<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item :command="item.command" v-for="item in stateTagArr" :disabled="item.disabled">{{
+ <el-dropdown-item :key="item" :command="item.command" v-for="item in stateTagArr" :disabled="item.disabled">{{
item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -31,7 +31,7 @@
宸ヨ壓鏂囦欢<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item :command="item.command" v-for="item in documentTagArr" :disabled="item.disabled">
+ <el-dropdown-item :key="item" :command="item.command" v-for="item in documentTagArr" :disabled="item.disabled">
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
@@ -43,7 +43,7 @@
瀹℃牳鐘舵�佹敼鍙�<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item :command="item.command" v-for="item in commitStateTagArr" :disabled="item.disabled">{{item.label }}</el-dropdown-item>
+ <el-dropdown-item :key="item" :command="item.command" v-for="item in commitStateTagArr" :disabled="item.disabled">{{item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-if="permissions.masterproductionschedule_submit_oa" @click="commitOa()" type="primary"
@@ -62,12 +62,12 @@
type="primary"
style="margin-left:10px;"
>SCM鐘舵�佸彉鏇�
- </el-button>
+ </el-button> -->
<el-button
type="primary"
style="margin-left:10px;"
>鏂板閲囪喘璁″垝
- </el-button> -->
+ </el-button>
</template>
</ttable>
@@ -486,33 +486,33 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '140',
- prop: 'outerColor',
- label: '澶栨姢棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '140',
- prop: 'lengthRequirement',
- label: '鐩橀暱瑕佹眰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '140',
- prop: 'printRequirement',
- label: '鍗板瓧瑕佹眰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '140',
+ // prop: 'outerColor',
+ // label: '澶栨姢棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '140',
+ // prop: 'lengthRequirement',
+ // label: '鐩橀暱瑕佹眰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '140',
+ // prop: 'printRequirement',
+ // label: '鍗板瓧瑕佹眰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '140',
prop: 'orderRemark',
diff --git a/src/views/plan/mpsrequirements/index.vue b/src/views/plan/mpsrequirements/index.vue
index ccac8f3..4e847e8 100644
--- a/src/views/plan/mpsrequirements/index.vue
+++ b/src/views/plan/mpsrequirements/index.vue
@@ -18,6 +18,7 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="item"
:command="item.command"
v-for="item in stateTagArr"
:disabled="item.disabled"
diff --git a/src/views/plan/operationtask/index.vue b/src/views/plan/operationtask/index.vue
index 9f48251..15f019c 100644
--- a/src/views/plan/operationtask/index.vue
+++ b/src/views/plan/operationtask/index.vue
@@ -21,6 +21,7 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="item"
:command="item.command"
v-for="item in stateTagArr"
:disabled="item.disabled"
diff --git a/src/views/plan/outsourcingorder/index.vue b/src/views/plan/outsourcingorder/index.vue
index e710c6d..2a82f99 100644
--- a/src/views/plan/outsourcingorder/index.vue
+++ b/src/views/plan/outsourcingorder/index.vue
@@ -21,9 +21,9 @@
<template v-for="item in stateTagArr">
<el-dropdown-item
:command="item.command"
- :disabled="item.disabled"
- >{{ item.eventName }}</el-dropdown-item
- >
+ :disabled="item.disabled">
+ {{ item.eventName }}
+ </el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
@@ -33,7 +33,7 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<template v-for="item in oaStateTagArr">
- <el-dropdown-item :command="item.command" v-if="item.isShow"
+ <el-dropdown-item :key="item" :command="item.command" v-if="item.isShow"
>{{ item.eventName }}
</el-dropdown-item>
</template>
diff --git a/src/views/quality/report/index.vue b/src/views/quality/report/index.vue
index 3001a9f..dabf2a4 100644
--- a/src/views/quality/report/index.vue
+++ b/src/views/quality/report/index.vue
@@ -81,10 +81,11 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="item"
:command="item.ref"
v-for="item in toolbarIsQualified"
:disabled="item.disabled"
- v-if="item.isShow"
+ v-show="item.isShow"
>{{ item.text }}
</el-dropdown-item>
</el-dropdown-menu>
--
Gitblit v1.9.3