diff --git a/src/views/basicData/teamManagement.vue b/src/views/basicData/teamManagement.vue
index 83b31b1..3a5f308 100644
--- a/src/views/basicData/teamManagement.vue
+++ b/src/views/basicData/teamManagement.vue
@@ -23,9 +23,12 @@
删 除
- 导入
-
+ -->
+
+
+ 导入
设置班组人员
diff --git a/src/views/basicData/workCenter.vue b/src/views/basicData/workCenter.vue
index 0a16664..56b8d25 100644
--- a/src/views/basicData/workCenter.vue
+++ b/src/views/basicData/workCenter.vue
@@ -355,11 +355,16 @@ export default {
// ],
},
{
- label: "",
+ label: "是否检验标记",
prop: "checkout",
- type: "checkbox",
- dicData: [{ label: "检验标记", value: 1 }],
- span: 8,
+ type: "switch",
+ // type: "checkbox",
+ dicData: [
+ { label:"否", value:0},
+ { label: "是", value: 1 },
+ ],
+ // dicData: [{ label: "检验标记", value: 1 }],
+ span: 24,
hide: true,
overflow: true,
search: false,
@@ -372,11 +377,16 @@ export default {
// ],
},
{
- label: "",
+ label: "是否镀后标记",
prop: "whetherPlate",
- type: "checkbox",
- dicData: [{ label: "镀后标记", value: 1 }],
- span: 8,
+ // type: "checkbox",
+ type: "switch",
+ dicData: [
+ { label:"否", value:0},
+ { label: "是", value: 1 },
+ ],
+ // dicData: [{ label: "镀后标记", value: 1 }],
+ span: 24,
hide: true,
overflow: true,
search: false,
@@ -389,11 +399,16 @@ export default {
// ],
},
{
- label: "",
+ label: "是否大批量",
prop: "bigBatch",
- type: "checkbox",
- dicData: [{ label: "是否大批量", value: 1 }],
- span: 8,
+ // type: "checkbox",
+ type:"switch",
+ dicData:[
+ { label:"否", value:0},
+ { label: "是", value: 1 },
+ ],
+ // dicData: [{ label: "是否大批量", value: 1 }],
+ span: 24,
hide: true,
overflow: true,
search: false,
@@ -436,9 +451,15 @@ export default {
console.log('form',this.form)
this.form.jcId = this.form.jcId + ''
this.form.leaderUser = this.form.leaderUser + ''
- this.form.checkout = this.form.checkout == 1 ? [1] : []
- this.form.bigBatch = this.form.bigBatch == 1 ? [1] : []
- this.form.whetherPlate = this.form.whetherPlate == 1 ? [1] : []
+ // this.form.checkout = this.form.checkout == 1 ? [1] : []
+ // this.form.bigBatch = this.form.bigBatch == 1 ? [1] : []
+ // this.form.whetherPlate = this.form.whetherPlate == 1 ? [1] : []
+
+ this.form.checkout = this.form.checkout == 1 ? 1 : 0
+ this.form.bigBatch = this.form.bigBatch == 1 ? 1 : 0
+ this.form.whetherPlate = this.form.whetherPlate == 1 ? 1 : 0
+
+
getAllUser({current:1,size:300}).then(res => {
this.leaderUsers = res.data.data.records
let tmp = this.leaderUsers.find(item => item.id == this.form.leaderUser)
@@ -458,11 +479,19 @@ export default {
}
},
rowSave(row, done, loading){
+ console.log('row----------',row)
+ // let params = {
+ // ...row,
+ // checkout:row.checkout.length != 0 ? 1 : 0,
+ // bigBatch:row.bigBatch.length != 0 ? 1 : 0,
+ // whetherPlate:row.whetherPlate.length != 0 ? 1 : 0,
+ // }
+
let params = {
...row,
- checkout:row.checkout.length != 0 ? 1 : 0,
- bigBatch:row.bigBatch.length != 0 ? 1 : 0,
- whetherPlate:row.whetherPlate.length != 0 ? 1 : 0,
+ checkout:row.checkout == 1 ? 1 : 0,
+ bigBatch:row.bigBatch == 1 ? 1 : 0,
+ whetherPlate:row.whetherPlate == 1 ? 1 : 0,
}
addWorkCenter(params).then(res =>{
@@ -474,12 +503,20 @@ export default {
})
},
rowUpdate(row, index, done, loading){
+ // let params = {
+ // ...row,
+ // checkout:row.checkout.length != 0 ? 1 : 0,
+ // bigBatch:row.bigBatch.length != 0 ? 1 : 0,
+ // whetherPlate:row.whetherPlate.length != 0 ? 1 : 0,
+ // }
+
let params = {
...row,
- checkout:row.checkout.length != 0 ? 1 : 0,
- bigBatch:row.bigBatch.length != 0 ? 1 : 0,
- whetherPlate:row.whetherPlate.length != 0 ? 1 : 0,
+ checkout:row.checkout == 1 ? 1 : 0,
+ bigBatch:row.bigBatch == 1 ? 1 : 0,
+ whetherPlate:row.whetherPlate == 1 ? 1 : 0,
}
+
updateWorkCenter(params).then(res =>{
if(res.data.code === 200){
this.$message.success('修改成功');
diff --git a/src/views/exemption/components/addDialog.vue b/src/views/exemption/components/addDialog.vue
index 899ef9e..9de415d 100644
--- a/src/views/exemption/components/addDialog.vue
+++ b/src/views/exemption/components/addDialog.vue
@@ -172,6 +172,7 @@ export default {
type: 'upload',
multiple: true,
span: 24,
+ limit: 1,
propsHttp: {
res: 'data',
url: 'link',
@@ -217,7 +218,8 @@ export default {
uploadDelete(file, column) {
console.log('uploadDelete', file, column);
this.attachLink = '';
- return true;
+ this.formData.attachLink = []
+ // return true;
},
uploadExceed(limit, files, fileList, column) {
this.$message.error('最多只能上传一个文件');
diff --git a/src/views/productionDisposition/hearingDialog.vue b/src/views/productionDisposition/hearingDialog.vue
index 15610b4..f42b81a 100644
--- a/src/views/productionDisposition/hearingDialog.vue
+++ b/src/views/productionDisposition/hearingDialog.vue
@@ -70,10 +70,10 @@
-
+
-
+
@@ -82,10 +82,10 @@
-
+
-
+
@@ -335,6 +335,7 @@ export default {
errorBigArr:[], //问题大类
errorSmallArr:[], //问题小类
detailInfo:{},
+ insideInfo:{},
checkList:[],
historyList:[],
checkWoId:'', //已选择的历史订单id
@@ -593,6 +594,9 @@ export default {
},
changeType(val){
console.log('val---------------------',val)
+ if(val == 2){
+ this.disposalType = 1
+ }
},
submit(val){
this.detailInfo.bizType = this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : ''
@@ -615,24 +619,30 @@ export default {
},
// 内部审理提交
submitInside(){
- // if(this.disposalType == 1){
- // let params = {
-
- // }
- // }
- // this.detailInfo = {
- // ...this.detailInfo,
- // bizType:this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : ''
- // }
- console.log('check===============',this.checkList.includes('isQualityProblem'))
- this.detailInfo.bizType = this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : ''
- this.detailInfo.isBatProblem = this.checkList.includes('isBatProblem') ? 1 : 0
- this.detailInfo.isClassicProblem = this.checkList.includes('isClassicProblem') ? 1 : 0
- this.detailInfo.isLowError = this.checkList.includes('isLowError') ? 1 : 0
- this.detailInfo.isQualityProblem = this.checkList.includes('isQualityProblem') ? 1 : 0
- this.detailInfo.submitType = 10
- console.log('detailInfo-----------------',this.detailInfo)
- createProductionDisposition(this.detailInfo).then(res =>{
+ console.log('inside--------------',this.insideInfo)
+ console.log('detail--------------',this.detailInfo)
+
+ let params = {
+ bizType:this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : '',
+ isBatProblem:this.checkList.includes('isBatProblem') ? 1 : 0,
+ isClassicProblem:this.checkList.includes('isClassicProblem') ? 1 : 0,
+ isLowError:this.checkList.includes('isLowError') ? 1 : 0,
+ isQualityProblem:this.checkList.includes('isQualityProblem') ? 1 : 0,
+ submitType:10,
+ ...this.insideInfo
+ }
+
+ console.log('params------------',params)
+
+ // console.log('check===============',this.checkList.includes('isQualityProblem'))
+ // this.detailInfo.bizType = this.testType == 1 ? 3 : this.testType == 2 ? this.disposalType == 1 ? 1 : 2 : ''
+ // this.detailInfo.isBatProblem = this.checkList.includes('isBatProblem') ? 1 : 0
+ // this.detailInfo.isClassicProblem = this.checkList.includes('isClassicProblem') ? 1 : 0
+ // this.detailInfo.isLowError = this.checkList.includes('isLowError') ? 1 : 0
+ // this.detailInfo.isQualityProblem = this.checkList.includes('isQualityProblem') ? 1 : 0
+ // this.detailInfo.submitType = 10
+ // console.log('detailInfo-----------------',this.detailInfo)
+ createProductionDisposition(params).then(res =>{
if(res.data.code == 200){
this.$message.success('提交成功')
this.closeDialog(true)
diff --git a/src/views/productionDisposition/index.vue b/src/views/productionDisposition/index.vue
index 07c4412..163756b 100644
--- a/src/views/productionDisposition/index.vue
+++ b/src/views/productionDisposition/index.vue
@@ -493,7 +493,7 @@ export default {
},
{
label: '审理状态',
- prop: 'reviewStatus',
+ prop: 'reviewStatusName',
addDisplay: false,
editDisplay: false,
span: 24,
diff --git a/src/views/qualityManagement/reviewFormMess/options.js b/src/views/qualityManagement/reviewFormMess/options.js
index 23216e2..3aa04c7 100644
--- a/src/views/qualityManagement/reviewFormMess/options.js
+++ b/src/views/qualityManagement/reviewFormMess/options.js
@@ -236,7 +236,7 @@ export const erpOption = {
calcHeight: 32,
simplePage: false,
searchShow: true,
- searchMenuSpan: 6,
+ searchMenuSpan: 18,
searchIcon: true,
searchIndex: 3,
tree: false,