From 5881cf33d6410528f713f8b49c708d83cff27c11 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 26 十二月 2023 14:33:34 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/productionschedul/index.vue | 75 +++++++++++-------
src/views/quality/rawMaterial/rawMaterial-form.vue | 8 +-
src/views/technology/routing/index.vue | 2
src/page/index/sidebar/index.vue | 14 +++
src/views/technology/completeproductstructure/index.vue | 98 +++++++++++++++++-------
5 files changed, 132 insertions(+), 65 deletions(-)
diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue
index 35dc685..de41a71 100644
--- a/src/page/index/sidebar/index.vue
+++ b/src/page/index/sidebar/index.vue
@@ -18,13 +18,27 @@
name: 'Sidebar',
data(){
return {
+ collapse: false
}
},
inject: ["Index"],
components: { sidebarItem, logo },
created() {
this.Index.openMenu(this.menuId);
+ // console.log(window.innerWidth);
+ // if(window.innerWidth <= 768){
+ // this.collapse = true
+ // this.$store.commit('SET_COLLAPSE')
+ // }
},
+ // watch:{
+ // 'window.innerWidth':{
+ // handler(newVal){
+ // console.log(newVal);
+ // },
+ // deep: true
+ // }
+ // },
computed: {
...mapGetters(['website', 'menu', 'tag', 'keyCollapse', 'screen']),
filterMenu: function(){
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index ea93866..9117ea8 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -2,13 +2,13 @@
<div class="mod-config">
<basic-container>
<el-row>
- <el-col :span="14">
- <el-row>
+ <el-col :span="14" style="height:100vh">
+ <el-row style="height:50%;padding:0px 10px;">
<el-col :span="24">
- <div style="height:40vh;padding: 0px 10px;">
- <span style="position: relative;top:40px;">鏈畬鎴�</span>
- <span style="position: relative;top:30px;left:60%;z-index: 11">
- <el-button @click="tagFinished" size="mini" round type="primary">鏍囪宸插畬鎴�</el-button>
+ <div>
+ <span style="position: relative;top:40px;color:#E84738">鏈畬鎴�</span>
+ <span style="position: relative;top:30px;left:61%;z-index: 11">
+ <el-button @click="tagFinished" size="mini" round type="success">鏍囪宸插畬鎴�</el-button>
<el-button size="mini" round type="primary"
v-if="permissions.plan_productionschedul_edit_line"
@click="openEditDialog">缂栬緫鏃堕棿绾�</el-button>
@@ -18,7 +18,7 @@
ref="crud"
:option="option"
:span-method="spanMethod"
- @refresh-change="getUnFinishedData"
+ @refresh-change="getDataList"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
:page="page"
@@ -42,10 +42,10 @@
</div>
</el-col>
</el-row>
- <el-row>
+ <el-row style="height:50%;padding:0px 10px;">
<el-col :span="24">
- <div style="height:40vh;padding: 0px 10px;">
- <span style="position: relative;top:40px">宸插畬鎴�</span>
+ <div>
+ <span style="position: relative;top:0px;color:#34BD66">宸插畬鎴�</span>
<avue-crud
:data="finishedTableData"
ref="finished"
@@ -75,7 +75,7 @@
<div slot="header" class="clearfix">
<span>璋冨害鏃堕棿绾�</span>
</div>
- <div style="height:70vh;overflow-y: scroll;">
+ <div style="height:100vh;overflow-y: scroll;">
<el-timeline>
<el-timeline-item
placement="top"
@@ -223,7 +223,7 @@
prop:'id',
order:'descending'
},
- height: 200,
+ height: 230,
selection: true,
columnBtn: false,
index: true,
@@ -333,7 +333,7 @@
prop:'id',
order:'descending'
},
- height: 180,
+ height: 250,
selection: true,
columnBtn: false,
index: true,
@@ -497,6 +497,11 @@
productionStatus: null,
}
}
+ },
+ multipleSelection(newVal){
+ if(newVal.length==0){
+ this.scheduleList = []
+ }
}
},
mounted() {
@@ -507,7 +512,7 @@
methods: {
tagFinished(){
if(this.multipleSelection.length < 1){
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�")
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
return
}
let ids = this.multipleSelection.map(ele=>{
@@ -545,17 +550,20 @@
},
openEditDialog(){
if(this.multipleSelection.length<1){
- this.$message.error("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
return
}
let mIds = this.multipleSelection.map(ele=>{
return ele.mid
})
checkTimeLines(mIds).then(res=>{
- console.log(res);
- if(res.data.code===200){
- this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList))
+ if(res.data.data.length==1){
+ let dataList = this.initTimeLine(res.data.data[0])
+ this.scheduleEditList = dataList
+ console.log(this.scheduleEditList);
this.dialogVisible = true
+ }else{
+ this.$message.error("閫変腑鏁版嵁鐨勮皟搴︽椂闂寸嚎涓嶄竴鑷�!")
}
}).catch(error=>{
console.error(error);
@@ -563,7 +571,9 @@
},
confirmEditSchedul(){
let data = this.scheduleEditList
- let orderObj = this.multipleSelection[0]
+ let mIds = this.multipleSelection.map(ele=>{
+ return ele.mid
+ })
let obj = {
"documentActualTime": data[0].actualTime,
"documentPlanTime": data[0].planTime,
@@ -577,13 +587,13 @@
"checkPlanTime": data[4].planTime,
"productActualTime": data[5].actualTime,
"productPlanTime": data[5].planTime,
- "id": orderObj.id,
- "contractNo": orderObj.contractNo,
- "customerName": orderObj.customerName,
- "deliveryDate": orderObj.deliveryDate,
- "orderTime": orderObj.orderTime,
- "productType": orderObj.productType,
- "projectName": orderObj.projectName
+ "mids": mIds,
+ // "contractNo": orderObj.contractNo,
+ // "customerName": orderObj.customerName,
+ // "deliveryDate": orderObj.deliveryDate,
+ // "orderTime": orderObj.orderTime,
+ // "productType": orderObj.productType,
+ // "projectName": orderObj.projectName
}
fillTime(obj).then(res=>{
if(res.status===200){
@@ -602,7 +612,7 @@
done()
},
initTimeLine(data){
- this.scheduleList = []
+ let scheduleList = []
if(data){
let arr = [
{
@@ -636,13 +646,14 @@
planTime: data.productPlanTime,
},
]
- this.scheduleList = arr
+ scheduleList = arr
+ return scheduleList
}
},
getScheduleById(id){
if(id){
fetchScheduleById(id).then(res=>{
- this.initTimeLine(res.data.data)
+ this.scheduleList = this.initTimeLine(res.data.data)
}).catch(error=>{
console.log(error);
})
@@ -692,6 +703,10 @@
}
},
// 鑾峰彇鏁版嵁鍒楄〃
+ getDataList(){
+ this.getUnFinishedData()
+ this.getFinishedData()
+ },
getUnFinishedData() {
this.loading = true
let param = {
@@ -725,7 +740,7 @@
// 鍒犻櫎
deleteHandle(row,index) {
const _than = this
- _than.$confirm('鏄惁纭鍒犻櫎', '鎻愮ず', {
+ _than.$confirm('鏄惁纭鍒犻櫎璇ョ敓浜ц皟搴︿俊鎭�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index b9aa4b5..5a05f43 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -115,14 +115,14 @@
<el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
<el-tab-pane label="妫�楠岄」鐩�">
<el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :xs="12" :lg="18"></el-col>
- <el-col :xs="4" :lg="2" style="text-align: right;">
+ <el-col :sm="12" :lg="18"></el-col>
+ <el-col :sm="4" :lg="2" style="text-align: right;">
<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
</el-col>
- <el-col :xs="4" :lg="2" style="text-align: right;">
+ <el-col :sm="4" :lg="2" style="text-align: right;">
<el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
</el-col>
- <el-col :xs="4" :lg="2" style="text-align: right;">
+ <el-col :sm="4" :lg="2" style="text-align: right;">
<el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</el-col>
</el-row>
diff --git a/src/views/technology/completeproductstructure/index.vue b/src/views/technology/completeproductstructure/index.vue
index 6187aab..8af0091 100644
--- a/src/views/technology/completeproductstructure/index.vue
+++ b/src/views/technology/completeproductstructure/index.vue
@@ -10,21 +10,7 @@
:ajaxFun="ajaxFun"
ref="completeProductStructureTable"
>
- <template #toolbar>
- <el-button type="primary" @click="addByStructureHandle"
- v-if="permissions.technology_completeproductstructure_bom">浜у搧缁撴瀯鐢熸垚BOM</el-button>
- <el-button @click="() => {this.approveHandle('ACCEPT')}"
- :disabled="uniqueStateArr.includes('01draft')"
- v-if="permissions.technology_completeproductstructure_accept">鎵瑰噯</el-button>
- <el-button @click="() => {this.approveHandle('REVOKE')}"
- :disabled="uniqueStateArr.includes('02accepted')"
- v-if="permissions.technology_completeproductstructure_revoke">鎾ゅ洖</el-button>
- <el-button @click="() => {this.approveHandle('CANCEL')}"
- :disabled="uniqueStateArr.includes('02accepted')"
- v-if="permissions.technology_completeproductstructure_cancel">鎷掔粷</el-button>
- <el-button @click="() => {this.deleteAll()}" type="primary"
- v-if="permissions.technology_completeproductstructure_batch_delete">鎵归噺鍒犻櫎</el-button>
- </template>
+ <template #toolbar></template>
</ttable>
</basic-container>
</div>
@@ -265,6 +251,48 @@
this.getData()
},
created() {
+ if(this.permissions.technology_completeproductstructure_bom){
+ this.table.toolbar.push({
+ text: '浜у搧缁撴瀯鐢熸垚BOM',
+ disabled: false,
+ type: 'primary',
+ fun: ()=>{this.addByStructureHandle()},
+ permitArr: [],
+ })
+ }
+ if(this.permissions.technology_completeproductstructure_accept){
+ this.table.toolbar.push({
+ text: '鎵瑰噯',
+ disabled: true,
+ fun: ()=>{this.approveHandle('ACCEPT')},
+ permitArr: ['01draft'],
+ })
+ }
+ if(this.permissions.technology_completeproductstructure_revoke){
+ this.table.toolbar.push({
+ text: '鎾ゅ洖',
+ disabled: true,
+ fun: () => {this.approveHandle('REVOKE')},
+ permitArr: ['02accepted'],
+ })
+ }
+ if(this.permissions.technology_completeproductstructure_cancel){
+ this.table.toolbar.push({
+ text: '鎷掔粷',
+ disabled: true,
+ fun: ()=>{this.approveHandle('CANCEL')},
+ permitArr: ['02accepted'],
+ })
+ }
+ if(this.permissions.technology_completeproductstructure_batch_delete){
+ this.table.toolbar.push({
+ text: '鎵归噺鍒犻櫎',
+ type:'primary',
+ disabled: false,
+ permitArr: [],
+ fun: ()=>{this.deleteAll()},
+ })
+ }
if(this.permissions.technology_completeproductstructure_del){
this.table.operator = [
{
@@ -276,6 +304,17 @@
]
}
this.getBomTypeDbOptions()
+ },
+ watch:{
+ multipleSelection(newVal){
+ if(newVal.length==0){
+ this.table.toolbar.forEach(ele=>{
+ if(ele.text=='鎷掔粷' || ele.text=='鎵瑰噯' || ele.text=='鎾ゅ洖'){
+ ele.disabled = true
+ }
+ })
+ }
+ }
},
methods: {
getBomTypeDbOptions() {
@@ -422,22 +461,21 @@
uniqueStateArr.push(stateArr[i])
}
}
- this.uniqueStateArr = uniqueStateArr
// 寰幆琛ㄥご鎸夐挳锛屽垽鏂瘡涓寜閽殑permitArr鏄惁瀹屽叏鍖呭惈閫変腑鐘舵�侊紝鑻ュ畬鍏ㄥ寘鍚紝鍒欐寜閽寒锛屽惁鍒欐寜閽伆
- // var toolbar = this.table.toolbar
- // for (var j = 0; j < toolbar.length; j++) {
- // if (
- // uniqueStateArr.every((val) =>
- // toolbar[j].permitArr.length <= 0
- // ? true
- // : toolbar[j].permitArr.includes(val)
- // )
- // ) {
- // toolbar[j].disabled = false
- // } else {
- // toolbar[j].disabled = true
- // }
- // }
+ var toolbar = this.table.toolbar
+ for (var j = 0; j < toolbar.length; j++) {
+ if (
+ uniqueStateArr.every((val) =>
+ toolbar[j].permitArr.length <= 0
+ ? true
+ : toolbar[j].permitArr.includes(val)
+ )
+ ) {
+ toolbar[j].disabled = false
+ } else {
+ toolbar[j].disabled = true
+ }
+ }
// 灏嗛�変腑璁板綍璧嬪�肩粰multipleSelection
this.multipleSelection = val
},
diff --git a/src/views/technology/routing/index.vue b/src/views/technology/routing/index.vue
index ba7ee5c..d281799 100644
--- a/src/views/technology/routing/index.vue
+++ b/src/views/technology/routing/index.vue
@@ -465,7 +465,7 @@
type:'primary',
disabled: false,
permitArr: [],
- fun: ()=>{this.copyRouting()},
+ fun: ()=>{this.deleteAll()},
})
}
if(this.permissions.technology_routing_del){
--
Gitblit v1.9.3