From 7af57170702277127862dd2c791ea72eaf9a086e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 19 十二月 2023 13:30:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/productionschedul/index.vue | 10 +++-
src/views/basic/factory/factory-form.vue | 1
src/views/plan/manufacturingorder/index.vue | 29 ++++++++++++--
vue.config.js | 4 +
src/views/basic/staff/staff-form.vue | 5 --
src/views/basic/post/post-form.vue | 1
src/const/crud/customerOrder/customerOrderForm.js | 56 ++++++++++++++--------------
src/views/basic/shift/shift-form.vue | 1
src/views/basic/division/division-form.vue | 1
src/views/basic/company/company-form.vue | 1
src/views/basic/crew/crew-form.vue | 1
11 files changed, 70 insertions(+), 40 deletions(-)
diff --git a/src/const/crud/customerOrder/customerOrderForm.js b/src/const/crud/customerOrder/customerOrderForm.js
index 99d8a29..9fda846 100644
--- a/src/const/crud/customerOrder/customerOrderForm.js
+++ b/src/const/crud/customerOrder/customerOrderForm.js
@@ -39,30 +39,6 @@
minWidth: 200,
span: 24
}, {
- label: '闆朵欢瑙勬牸',
- prop: 'customerPartSpec',
- type: 'input',
- cell: true,
- minWidth: 200,
- span: 24
- }, {
- label: '鍒堕�犲睘鎬�',
- prop: 'manufactureAttr',
- cell: true,
- type: 'select',
- minWidth: 200,
- span: 24,
- dicData:[{
- label: '鏅��',
- value: 'N'
- },{
- label: '鏍峰搧',
- value: 'S'
- },{
- label: '鐮斿彂',
- value: 'D'
- }]
- }, {
label: '浜у搧鍚嶇О',
prop: 'productName',
cell: true,
@@ -70,13 +46,13 @@
minWidth: 200,
span: 24
}, {
- label: '闅跺睘鍝佺墝',
- prop: 'productType',
- cell: true,
+ label: '瑙勬牸鍨嬪彿',
+ prop: 'customerPartSpec',
type: 'input',
+ cell: true,
minWidth: 200,
span: 24
- }, {
+ }, {
label: '鍗曚綅',
prop: 'otcUnit',
slot: true,
@@ -95,6 +71,30 @@
span: 24,
rules:[{required:true,message:'绫诲瀷蹇呴』鏄暟瀛�',trigger:'blur'}]
}, {
+ label: '鍒堕�犲睘鎬�',
+ prop: 'manufactureAttr',
+ cell: true,
+ type: 'select',
+ minWidth: 200,
+ span: 24,
+ dicData:[{
+ label: '鏅��',
+ value: 'N'
+ },{
+ label: '鏍峰搧',
+ value: 'S'
+ },{
+ label: '鐮斿彂',
+ value: 'D'
+ }]
+ }, {
+ label: '闅跺睘鍝佺墝',
+ prop: 'productType',
+ cell: true,
+ type: 'input',
+ minWidth: 200,
+ span: 24
+ },{
label: '鏀惰揣鍦板潃',
prop: 'shippingAddress',
cell: true,
diff --git a/src/views/basic/company/company-form.vue b/src/views/basic/company/company-form.vue
index ac6162b..f803fd6 100644
--- a/src/views/basic/company/company-form.vue
+++ b/src/views/basic/company/company-form.vue
@@ -377,6 +377,7 @@
this.$emit('refreshDataList')
})
}
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/crew/crew-form.vue b/src/views/basic/crew/crew-form.vue
index de33d0b..63d4488 100644
--- a/src/views/basic/crew/crew-form.vue
+++ b/src/views/basic/crew/crew-form.vue
@@ -90,6 +90,7 @@
this.$emit('refreshDataList')
})
}
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/division/division-form.vue b/src/views/basic/division/division-form.vue
index 43476c2..9f24fee 100644
--- a/src/views/basic/division/division-form.vue
+++ b/src/views/basic/division/division-form.vue
@@ -179,6 +179,7 @@
}
this.isSubmit = false
})
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/factory/factory-form.vue b/src/views/basic/factory/factory-form.vue
index 41374ac..328fa53 100644
--- a/src/views/basic/factory/factory-form.vue
+++ b/src/views/basic/factory/factory-form.vue
@@ -171,6 +171,7 @@
}
this.isSubmit = false
})
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/post/post-form.vue b/src/views/basic/post/post-form.vue
index 846d0be..2f9055e 100644
--- a/src/views/basic/post/post-form.vue
+++ b/src/views/basic/post/post-form.vue
@@ -101,6 +101,7 @@
this.$emit('refreshDataList')
})
}
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/shift/shift-form.vue b/src/views/basic/shift/shift-form.vue
index be46727..5f14b80 100644
--- a/src/views/basic/shift/shift-form.vue
+++ b/src/views/basic/shift/shift-form.vue
@@ -366,6 +366,7 @@
this.$emit('refreshDataList')
})
}
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/staff/staff-form.vue b/src/views/basic/staff/staff-form.vue
index 7f8e1c8..6abcaef 100644
--- a/src/views/basic/staff/staff-form.vue
+++ b/src/views/basic/staff/staff-form.vue
@@ -248,10 +248,7 @@
}
this.isSubmit = false
})
- .catch((error) => {
- this.isSubmit = false
- console.log(error)
- })
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index ec2c361..d760c3e 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -210,7 +210,7 @@
<el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
<el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
- <el-row>
+ <!-- <el-row>
<el-col :span="10" :offset="3">鎵规鍙�</el-col>
<el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
</el-row>
@@ -231,7 +231,28 @@
<el-col :span="10">
<vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
</el-col>
- </el-row>
+ </el-row> -->
+ <div style="display: flex;">
+ <div>
+ <el-col :span="8" :offset="2">
+ <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
+ </el-col>
+ </div>
+ <div style="margin-left: 20px;width: 100%;">
+ <el-row >
+ <el-col style="font-weight: bold;"><span>鎵规鍙�: </span>{{ item.code.moNo2 }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 5px;">
+ <el-col style="font-weight: bold;"><span>璁㈠崟鍙�: </span>{{ item.orderNo }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 5px;">
+ <el-col style="font-weight: bold;"><span>瀹㈡埛鍚嶇О: </span>{{ item.cName }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 5px;">
+ <el-col style="font-weight: bold;">{{ item.pName }}</el-col>
+ </el-row>
+ </div>
+ </div>
</el-card>
</el-checkbox-group>
</div>
@@ -241,9 +262,9 @@
<el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
</span>
</el-dialog>
- <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;padding: 0;">
+ <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
<div id="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="padding-top:0px;margin-bottom:10px;font-size: 16px !important;">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 16px !important;">
<el-row style="font-size:12px;">
<el-col :span="10" :offset="3">鎵规鍙�</el-col>
<el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 2ae8a2b..72fd3d4 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -165,6 +165,10 @@
pagerCount: 5
},
option: {
+ defaultSort:{
+ prop:'id',
+ order:'descending'
+ },
height: 400,
selection: true,
columnBtn: false,
@@ -305,11 +309,11 @@
this.loading = true
this.getData()
this.getParamType()
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
beforeUpdate() {
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
watch:{
@@ -513,7 +517,7 @@
ele.span = this.rowSpan(ele.prop, parent)
})
},
- rowSort(list) {
+ rowSort() {
let propList = this.spanArr.map(ele => ele.prop)
this.spanArr.forEach((ele, index) => {
let key = ele.prop
diff --git a/vue.config.js b/vue.config.js
index f14c50a..87d2793 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,11 +6,13 @@
// const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
+// const url = 'http://192.168.2.7:9999'
+const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
-const url = 'http://localhost:9999'
+// const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3