From 9b825939b7f0a7439d704b379812362dd95697fc Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 11 七月 2022 17:49:26 +0800
Subject: [PATCH] 1.优化代码2.修改实施部提出的bug3.生产开报工外协列表自动弹窗实现部分

---
 src/views/jcsz/zzjg.vue |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 277b859..c0a68ed 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -48,7 +48,7 @@
           stripe
           :style="{width: 100+'%',height:tableHeight+'px'}"
           highlight-current-row
-          :height="tableHeight"
+          :height="tableHeight+'px'"
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
           @sort-change="sortChange"
@@ -90,7 +90,12 @@
             prop="parentorg_name"
             label="涓婄骇鍗曚綅"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.parentorg_name===null">/</div>
+              <div v-else>{{ row.parentorg_name }}</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="lm_user"
             label="鍒涘缓浜哄憳"
@@ -129,7 +134,7 @@
     <el-dialog
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
-      width="60%"
+      width="800px"
       top="15vh"
       :close-on-click-modal="false"
       @closed="handleClose"
@@ -150,7 +155,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
-          <el-input v-model="dialogForm.OrgCode" disabled style="width: 200px" />
+          <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: 200px" />
@@ -190,7 +195,7 @@
 
 const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: 'Zzjg',
+  name: 'ZZJG',
   components: {
     Pagination
   },
@@ -353,9 +358,9 @@
       this.operation = operation
       this.dialogVisible = true
 
-      const res = await getNewEncodingRules(getCookie('ruleCode'))
-      this.dialogForm.OrgCode = res.RightCode
-      this.numvalue = res.numvalue
+      // const res = await getNewEncodingRules(getCookie('ruleCode'))
+      // this.dialogForm.OrgCode = res.RightCode
+      // this.numvalue = res.numvalue
     },
     // 淇敼鎸夐挳
     edit(operation, row) {
@@ -416,8 +421,10 @@
             OrganType: this.dialogFormOrgTypeSelected,
             OrganCode: this.dialogForm.OrgCode,
             OrganName: this.dialogForm.OrgName,
-            RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
-            numvalue: this.operation === 'add' ? this.numvalue : '',
+            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')
@@ -493,9 +500,9 @@
   color: #606266;
 }
 
-//::v-deep .el-dialog__body {
-//  padding: 20px 100px !important;
-//}
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
 
 ::v-deep .el-radio__input.is-checked .el-radio__inner {
   background-color: $main_color;

--
Gitblit v1.9.3