From f791db88d83a7ed851b9412d9797ed16b345fe79 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 07 七月 2022 18:39:18 +0800
Subject: [PATCH] 1.项目页面修改2.生产管理工单页面开发
---
src/views/jcsz/zzjg.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 235f4ac..20be7ef 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -99,7 +99,6 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
- show-overflow-tooltip
sortable="custom"
/>
<el-table-column
@@ -107,7 +106,7 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+ <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
<el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
</div>
</template>
@@ -128,10 +127,11 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
@@ -150,15 +150,15 @@
</el-radio-group>
</el-form-item>
<el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-input v-model="dialogForm.OrgName" style="width: 200px" />
</el-form-item>
<el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
<el-select
v-model="dialogForm.SupUnit"
- style="width: 220px"
+ style="width: 200px"
filterable
:popper-append-to-body="false"
placeholder="璇烽�夋嫨"
@@ -186,6 +186,7 @@
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
+import { getNewEncodingRules } from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -213,8 +214,11 @@
}
}
return {
+ windowHeight: 0,
+ windowWidth: 0,
mainHeight: 0,
tableHeight: 0,
+ numvalue: 0,
form: {
OrgCode: '', // 缁勭粐鏋舵瀯浠ｇ爜
OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
@@ -262,12 +266,38 @@
}
},
+ // watch: {
+ // windowHeight(val) {
+ // console.log('瀹炴椂灞忓箷楂樺害锛�', val, this.windowHeight)
+ // },
+ // windowWidth(val) {
+ // if (val < 768) {
+ // this.dialogWidth = '100%'
+ // } else {
+ // this.dialogWidth = '75%'
+ // }
+ // console.log('瀹炴椂灞忓箷瀹藉害锛�', val, this.windowHeight)
+ // }
+ // },
created() {
this.getOrganizationSearch()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
+
+ // console.log('椤甸潰杩涘叆鏃剁殑瀹藉害锛�', document.body.clientWidth)
+ // if (document.body.clientWidth < 768) {
+ // this.dialogWidth = '100%'
+ // }
+ //
+ // // <!--鎶妛indow.onresize浜嬩欢鎸傚湪鍒癿ounted鍑芥暟涓�-->
+ // window.onresize = () => {
+ // return (() => {
+ // this.windowHeight = document.documentElement.clientHeight// 楂�
+ // this.windowWidth = document.documentElement.clientWidth // 瀹�
+ // })()
+ // }
},
methods: {
async getOrganizationSearch() {
@@ -319,9 +349,13 @@
},
// 鏂板鎸夐挳
- add(operation) {
+ async add(operation) {
this.operation = operation
this.dialogVisible = true
+
+ // const res = await getNewEncodingRules(getCookie('ruleCode'))
+ // this.dialogForm.OrgCode = res.RightCode
+ // this.numvalue = res.numvalue
},
// 淇敼鎸夐挳
edit(operation, row) {
@@ -382,6 +416,10 @@
OrganType: this.dialogFormOrgTypeSelected,
OrganCode: this.dialogForm.OrgCode,
OrganName: this.dialogForm.OrgName,
+ RightCode: '',
+ numvalue: '',
+ // RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
+ // numvalue: this.operation === 'add' ? this.numvalue : '',
SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
OperType: this.operation === 'add' ? 'Add' : 'Update',
Operator: getCookie('admin')
--
Gitblit v1.9.3