From 392f9468875a8721c17c4e15c288333017cac4a1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 16 七月 2022 15:11:44 +0800
Subject: [PATCH] 1.修改bug2.工序检验实现部分3.缺陷定义实现部分

---
 src/views/zzmx/chda.vue           |   79 +-
 src/views/scgl/scdd.vue           |   39 +
 src/views/zlgl/gxjy.vue           |  492 ++++++++++++++++
 src/views/jcsz/wldw.vue           |   19 
 src/views/scgl/gd.vue             |    2 
 src/views/zzmx/gylx.vue           |   27 
 src/assets/images/xkd_newlogo.png |    0 
 src/api/user.js                   |    7 
 src/views/login/index.vue         |   11 
 src/views/sbgl/sbqd.vue           |   18 
 src/views/scgl/sckbg.vue          |  237 ++++++-
 src/layout/components/Navbar.vue  |  143 ++++
 src/views/template.vue            |    3 
 src/api/zlgl.js                   |   88 +++
 src/views/jcsz/yhqd.vue           |   10 
 src/views/zlgl/qxdy.vue           |  492 ++++++++++++++++
 src/views/jcsz/jsqd.vue           |   12 
 src/views/xtsz/bmgz.vue           |    2 
 src/views/zzmx/gxdy.vue           |   16 
 19 files changed, 1,559 insertions(+), 138 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index bb9faa4..0a6db30 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -29,3 +29,10 @@
     params: data
   })
 }
+export function UpdateUserPassword(data) {
+  return request({
+    url: '/Login/UpdateUserPassword',
+    method: 'post',
+    params: data
+  })
+}
diff --git a/src/api/zlgl.js b/src/api/zlgl.js
new file mode 100644
index 0000000..ca6c676
--- /dev/null
+++ b/src/api/zlgl.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request'
+
+// 璐ㄩ噺绠＄悊,缂洪櫡瀹氫箟鏌ヨ鍒楄〃
+export function DedectSearch(data) {
+  return request({
+    url: 'QualityManagement/DedectSearch',
+    method: 'get',
+    params: data
+  })
+}
+
+// 璐ㄩ噺绠＄悊锛岀己闄峰畾涔夋柊澧炪�佺紪杈戞彁浜�
+export function AddUpdateDedect(data) {
+  return request({
+    url: 'QualityManagement/AddUpdateDedect',
+    method: 'post',
+    data
+  })
+}
+
+// 璐ㄩ噺绠＄悊锛岀己闄峰畾涔夊垹闄�
+export function DeleteDedect(data) {
+  return request({
+    url: 'QualityManagement/DeleteDedect',
+    method: 'post',
+    params: data
+  })
+}
+
+// 宸ュ簭妫�楠屾爣鍑嗗垪琛ㄦ煡璇�
+export function StepCheckStanedSearch(data) {
+  return request({
+    url: 'QualityManagement/StepCheckStanedSearch',
+    method: 'get',
+    params: data
+  })
+}
+
+// 宸ュ簭妫�楠屾爣鍑嗙紪杈戣幏鍙栨暟鎹�
+export function EditStepCheckStanedSearch(data) {
+  return request({
+    url: 'QualityManagement/EditStepCheckStanedSearch',
+    method: 'post',
+    params: data
+  })
+}
+
+// 宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
+export function StepCheckItemSelect() {
+  return request({
+    url: 'QualityManagement/StepCheckItemSelect',
+    method: 'get'
+  })
+}
+
+// 宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戞彁浜�
+export function AddUpdateStepCheckStaned(opertype, data) {
+  return request({
+    url: 'QualityManagement/AddUpdateStepCheckStaned?opertype=' + opertype,
+    method: 'post',
+    data
+  })
+}
+
+// 宸ュ簭妫�楠岄」鐩垪琛ㄦ煡璇�
+export function StepCheckItemSearch(data) {
+  return request({
+    url: 'QualityManagement/StepCheckItemSearch',
+    method: 'get',
+    params: data
+  })
+}
+// 宸ュ簭妫�楠岄」鐩柊澧炪�佺紪杈戞彁浜�
+export function AddUpdateStepCheckItem(data) {
+  return request({
+    url: 'QualityManagement/AddUpdateStepCheckItem',
+    method: 'post',
+    data
+  })
+}
+// 宸ュ簭妫�楠岄」鐩垹闄�
+export function DeleteStepCheckItem(data) {
+  return request({
+    url: 'QualityManagement/DeleteStepCheckItem',
+    method: 'post',
+    params: data
+  })
+}
diff --git a/src/assets/images/xkd_newlogo.png b/src/assets/images/xkd_newlogo.png
new file mode 100644
index 0000000..5ebf256
--- /dev/null
+++ b/src/assets/images/xkd_newlogo.png
Binary files differ
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c94a446..afd5cae 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -15,7 +15,7 @@
 
           <!--          <i class="el-icon-caret-bottom" />-->
         </div>
-        <el-dropdown-menu slot="dropdown" class="user-dropdown">
+        <el-dropdown-menu slot="dropdown" class="user-dropdown" style="text-align: center">
           <!--          <router-link to="/">-->
           <!--            <el-dropdown-item>-->
           <!--              Home-->
@@ -27,16 +27,44 @@
           <!--          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">-->
           <!--            <el-dropdown-item>Docs</el-dropdown-item>-->
           <!--          </a>-->
-          <!--          <el-dropdown-item @click.native="logout">-->
-          <!--            <span style="display:block;">淇敼瀵嗙爜</span>-->
-          <!--          </el-dropdown-item>-->
-          <!--          divided-->
-          <el-dropdown-item @click.native="logout">
-            <span style="display:block;">閫�鍑�</span>
+          <el-dropdown-item @click.native="editPassword">
+            <span style="display:block;">淇敼瀵嗙爜</span>
+          </el-dropdown-item>
+          <el-dropdown-item divided @click.native="logout">
+            <span style="display:block;font-weight: bolder">閫�鍑�</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>
+    <el-dialog
+      title="淇敼瀵嗙爜"
+      :visible.sync="dialogVisible"
+      width="500px"
+      :close-on-click-modal="false"
+      @close="handleClose"
+      @closed="handleClose"
+    >
+      <el-form ref="dialogForm" :rules="formRules" :model="form" label-width="100px">
+        <!--        <el-form-item label="鐢ㄦ埛缂栫爜锛�">-->
+        <!--          <div>{{ usercode }}</div>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="鐢ㄦ埛鍚嶇О锛�">-->
+        <!--          <div> {{ username }}</div>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="瀵嗙爜锛�" prop="password">
+          <el-input v-model="form.password" style="width: 220px;" />
+        </el-form-item>
+        <el-form-item label="鏂板瘑鐮侊細" prop="newpassword">
+          <el-input v-model="form.newpassword" style="width: 220px;" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button @click="dialogVisibleCancel">杩斿洖</el-button>
+          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -44,10 +72,10 @@
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
-import { getCookie, removeCookie, removeToken } from '@/utils/auth'
-import { logout } from '@/api/user'
-import { resetRouter } from '@/router'
+import { getCookie } from '@/utils/auth'
+import { UpdateUserPassword } from '@/api/user'
 
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   components: {
     Breadcrumb,
@@ -60,11 +88,37 @@
     ])
   },
   created() {
+    this.usercode = getCookie('navTabId')
     this.username = getCookie('admin')
   },
   data() {
+    const validatePassword = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇疯緭鍏ュ瘑鐮侊紒'))
+      } else {
+        if (SER_HZ.test(value)) {
+          return callback(new Error('瀵嗙爜涓嶈兘涓轰腑鏂囷紒'))
+        } else {
+          callback()
+        }
+      }
+    }
     return {
-      username: ''
+      usercode: '',
+      username: '',
+      form: {
+        password: '',
+        newpassword: ''
+      },
+      dialogVisible: false,
+      formRules: {
+        password: [
+          { required: true, validator: validatePassword, trigger: ['blur', 'change'] }
+        ],
+        newpassword: [
+          { required: true, validator: validatePassword, trigger: ['blur', 'change'] }
+        ]
+      }
     }
   },
   methods: {
@@ -75,6 +129,36 @@
       await this.$store.dispatch('user/logout')
       this.$message.success('閫�鍑烘垚鍔燂紒')
       this.$router.push(`/login`)
+    },
+    editPassword() {
+      this.dialogVisible = true
+    },
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          const data = {
+            usercode: this.usercode,
+            username: this.username,
+            password: this.form.password,
+            newpassword: this.form.newpassword
+          }
+          console.log(data)
+          UpdateUserPassword(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success('淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+            }
+          })
+        }
+      })
+    },
+    handleClose() {
+      this.form.password = ''
+      this.form.newpassword = ''
+      this.$refs.dialogForm.clearValidate()
     }
   }
 }
@@ -86,7 +170,7 @@
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 
   .hamburger-container {
     line-height: 46px;
@@ -94,7 +178,7 @@
     float: left;
     cursor: pointer;
     transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
       background: rgba(0, 0, 0, .025)
@@ -139,11 +223,12 @@
         margin-top: 5px;
         position: relative;
         cursor: pointer;
-        .headerImg{
+
+        .headerImg {
           margin: 5px;
         }
 
-        .headerName{
+        .headerName {
           font-weight: bolder;
         }
 
@@ -164,5 +249,33 @@
       }
     }
   }
+
+  .footerButton {
+    display: flex;
+    justify-content: end;
+  }
+
+  ::v-deep .el-button--primary {
+    background-color: #42b983 !important;
+    height: 30px;
+    display: flex;
+    align-items: center;
+    //border: 1px solid $main_color;
+    border: none;
+    padding: 0 20px;
+  }
+
+  ::v-deep .el-button--default {
+    background-color: #ffffff !important;
+    height: 30px;
+    display: flex;
+    align-items: center;
+    padding: 0 20px;
+  }
+
+  ::v-deep .el-input__inner {
+    height: 30px;
+    line-height: 30px;
+  }
 }
 </style>
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 8071e93..4a554be 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -104,23 +104,25 @@
             sortable="custom"
           />
           <el-table-column
-            prop="lm_date"
+            prop="is_user"
             label="鍏宠仈鐢ㄦ埛"
             width="120"
             sortable="custom"
           >
             <template slot-scope="{row}">
-              <i class="el-icon-user-solid" @click="userClick(row)" />
+              <i v-if="row.is_user==='Y'" class="el-icon-user-solid" @click="userClick(row)" />
+              <i v-if="row.is_user==='N'" class="el-icon-user-solid" style="color: #E4E7ED" @click="userClick(row)" />
             </template>
           </el-table-column>
           <el-table-column
-            prop="lm_date"
+            prop="is_right"
             label="鍒嗛厤鏉冮檺"
             sortable="custom"
             width="120"
           >
             <template slot-scope="{row}">
-              <i class="el-icon-share" @click="rightClick(row)" />
+              <i v-if="row.is_right==='Y'" class="el-icon-share" @click="rightClick(row)" />
+              <i v-if="row.is_right==='N'" class="el-icon-share" style="color: #E4E7ED" @click="rightClick(row)" />
             </template>
           </el-table-column>
           <el-table-column
@@ -941,6 +943,7 @@
       const res = await SaveRoleAssoctUser(userMultipleArr, this.dialogFormUser.rolecode)
       if (res.code === '200') {
         this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getRoleSearch()
         this.userDialogVisible = false
       }
     },
@@ -1188,6 +1191,7 @@
       const res = await SaveUserAssoctRight(rightSubmit, rolecode, usercode)
       if (res.code === '200') {
         this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getRoleSearch()
         this.dialogVisibleRight = false
       }
     },
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 11e1a2b..4708983 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -226,6 +226,22 @@
         }
       }
     }
+    const validateMobile = (rule, value, callback) => {
+      if (!value) {
+        callback()
+        // return callback(new Error('璇疯緭鍏ョ數璇濆彿鐮�'))
+      } else {
+        const mobile = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ // 闀垮彿
+        const mobile2 = /^[0-9]{6}$/ // 鐭彿
+        if (mobile.test(value) || mobile2.test(value)) {
+          callback()
+          // return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
+        } else {
+          return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
+          // callback()
+        }
+      }
+    }
     return {
       mainHeight: 0,
       tableHeight: 0,
@@ -271,6 +287,9 @@
         ],
         checkboxIsSelected: [
           { required: true, message: '璇烽�夋嫨渚涙柟灞炴��', trigger: ['blur', 'change'] }
+        ],
+        contact: [
+          { required: true, validator: validateMobile, trigger: ['blur', 'change'] }
         ]
       }
 
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 915bd58..8fa2200 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -176,7 +176,8 @@
             label="鍏宠仈瑙掕壊"
           >
             <template slot-scope="{row}">
-              <i class="el-icon-share" @click="roleClick({row})" />
+              <i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
+              <i v-if="row.is_role==='N'" class="el-icon-share" style="color: #E4E7ED" @click="roleClick({row})" />
             </template>
           </el-table-column>
           <el-table-column
@@ -880,6 +881,7 @@
       const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
       if (res.code === '200') {
         this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getUserSearch()
         this.dialogVisibleRoles = false
       }
     },
@@ -1167,9 +1169,9 @@
       if (row.group_name.trim().length < 1) {
         return this.$message.info('鐝粍鍚嶇О涓嶈兘涓虹┖锛�')
       }
-      if (row.description.trim().length < 1) {
-        return this.$message.info('鐝粍鎻忚堪涓嶈兘涓虹┖锛�')
-      }
+      // if (row.description.trim().length < 1) {
+      //   return this.$message.info('鐝粍鎻忚堪涓嶈兘涓虹┖锛�')
+      // }
       const data = {
         code: row.group_code,
         name: row.group_name,
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4242fb5..25d5aa0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -51,7 +51,7 @@
 
         <div class="title-container">
           <div class="title_img" />
-          <h3 class="title">鏂板嚡杩埗閫犱簯骞冲彴</h3>
+          <!--          <h3 class="title">鏂板嚡杩埗閫犱簯骞冲彴</h3>-->
         </div>
 
         <el-form-item prop="username">
@@ -103,7 +103,7 @@
         <el-button
           :loading="loading"
           type="primary"
-          style="width:100%;margin-bottom:30px;"
+          style="width:100%;margin-top:20px;"
           @click.native.prevent="handleLogin"
         >鐧诲綍
         </el-button>
@@ -336,10 +336,11 @@
     align-items: center;
 
     .title_img {
-      background: url("../../assets/images/xkd_logo.png");
-      width: 200px;
-      height: 100px;
+      background: url("../../assets/images/xkd_newlogo.png") no-repeat;
+      width: 300px;
+      height: 200px;
       margin: -50px 0 20px;
+      background-size: 100% 100%;
     }
 
     .title {
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 5ed3550..2bad529 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -331,7 +331,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="绋煎姩鐜�" prop="ratio">
-          <el-input v-model="dialogForm.ratio" style="width: 195px" />
+          <el-input v-model="dialogForm.ratio" style="width: 175px" />
           <span style="margin-left: 10px">%</span>
         </el-form-item>
 
@@ -612,7 +612,7 @@
         importdate: '',
         workshopcode: '',
         linecode: '',
-        status: '',
+        status: 'Y',
         ratio: ''
       },
       DeviceGroupDialogArr: [], // 璁惧缁勬暟缁�
@@ -784,7 +784,7 @@
       this.dialogForm.importdate = ''
       this.dialogForm.workshopcode = ''
       // this.dialogForm.linecode = ''
-      this.dialogForm.status = ''
+      this.dialogForm.status = 'Y'
       this.dialogForm.ratio = ''
       this.$refs.dialogForm.clearValidate()
     },
@@ -912,9 +912,9 @@
       if (row.name.trim().length < 1) {
         return this.$message.info('绫诲瀷鍚嶇О涓嶈兘涓虹┖锛�')
       }
-      if (row.remark.trim().length < 1) {
-        return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
-      }
+      // if (row.remark.trim().length < 1) {
+      //   return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
+      // }
       const data = {
         'code': row.code,
         'name': row.name,
@@ -1026,9 +1026,9 @@
       if (row.eqptype_code.trim().length < 1) {
         return this.$message.info('鎵�灞炶澶囩被鍨嬩笉鑳戒负绌猴紒')
       }
-      if (row.remark.trim().length < 1) {
-        return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
-      }
+      // if (row.remark.trim().length < 1) {
+      //   return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
+      // }
       const data = {
         'code': row.code,
         'name': row.name,
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 4296c2c..946845a 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -190,7 +190,7 @@
             prop="route_name"
             label="宸ヨ壓璺嚎"
             sortable="custom"
-            width="120"
+            width="130"
           />
 
           <el-table-column
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 30151be..a7bbee7 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -121,7 +121,7 @@
         <el-button
           type="primary"
           icon="el-icon-refresh-right"
-          @click="reset('update')"
+          @click="syncERP"
         >鍚屾ERP
         </el-button>
         <el-button
@@ -206,6 +206,12 @@
           <el-table-column
             prop="qty"
             label="璁㈠崟鏁伴噺"
+            width="150"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="relse_qty"
+            label="宸蹭笅鍗曟暟閲�"
             width="150"
             sortable="custom"
           />
@@ -498,12 +504,33 @@
       this.form.prop = prop
       this.getErpOrderSearch()
     },
+    // 鍚屾ERP
+    async  syncERP() {
+      const loading = this.$loading({
+        lock: true,
+        text: '姝ｅ湪鍚屾ERP锛岃绋嶇瓑...',
+        spinner: 'el-icon-loading',
+        customClass: 'osloading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      setTimeout(() => {
+        loading.close()
+      }, 2000)
+
+      // const res = await xxx()
+      // if (res.code==='200'){
+      setTimeout(() => {
+        loading.close()
+        this.getErpOrderSearch()
+      }, 2000)
+      // }
+    },
     // 鏌ヨ
     search() {
       this.getErpOrderSearch()
     },
     // 閲嶇疆
-    reset(val) {
+    reset() {
       this.form.erporderstus = ''
       this.form.erpordercode = ''
       this.form.partcode = ''
@@ -513,9 +540,6 @@
       this.form.creatuser = ''
       this.form.createdate = ''
       this.getErpOrderSearch()
-      if (val.length > 0) {
-        this.$message.success('ERP宸插悓姝ワ紒')
-      }
     },
     // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
     getCurrentRow(wo) {
@@ -820,3 +844,8 @@
 }
 
 </style>
+<style>
+.osloading{
+  font-size: 40px;
+}
+</style>
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 252e3c9..c7ca965 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -303,7 +303,7 @@
             @pagination="getMesOrderStepSearch"
           />
         </el-tab-pane>
-        <el-tab-pane v-if="false" label="宸ュ簭妫�楠�">
+        <el-tab-pane label="宸ュ簭妫�楠�">
           <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
             <div style="margin-bottom: 10px;font-size: 14px">
               <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
@@ -318,38 +318,40 @@
                 @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
               />
             </div>
-            <div style="line-height: 40px; display: flex;margin-top: 20px">
-              <div style="display: flex;margin-right: 50px">
-                <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
-                <div>PX00120012312</div>
-              </div>
+            <!--        鍏」淇℃伅      -->
+            <div style="display:flex;margin-top: 10px;align-items: center">
               <div style="display: flex;">
-                <div style="width: 90px">浜у搧缂栫爜锛�</div>
-                <div>123-446-789</div>
+                <div style="display: flex;margin-right: 50px">
+                  <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
+                  <div style="width: 100px">PX00120012312</div>
+                </div>
+                <div style="display: flex;">
+                  <div style="width: 90px">浜у搧缂栫爜锛�</div>
+                  <div style="width: 100px">123-446-789</div>
+                </div>
+              </div>
+              <div style="display: flex;margin-left: 30px;">
+                <div style="display: flex;margin-right: 50px">
+                  <div style="width: 90px">浜у搧鍚嶇О锛�</div>
+                  <div style="width: 100px">PX00120012312</div>
+                </div>
+                <div style="display: flex;">
+                  <div style="width: 90px">浜у搧瑙勬牸锛�</div>
+                  <div style="width: 100px">123-446-789</div>
+                </div>
+              </div>
+              <div style=" display: flex;margin-left: 30px;">
+                <div style="display: flex;margin-right: 50px">
+                  <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
+                  <div>PX00120012312</div>
+                </div>
+                <div style="display: flex;">
+                  <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
+                  <div>123-446-789</div>
+                </div>
               </div>
             </div>
-            <div style="line-height: 40px; display: flex;">
-              <div style="display: flex;margin-right: 50px">
-                <div style="width: 90px">浜у搧鍚嶇О锛�</div>
-                <div>PX00120012312</div>
-              </div>
-              <div style="display: flex;">
-                <div style="width: 90px">浜у搧瑙勬牸锛�</div>
-                <div>123-446-789</div>
-              </div>
-            </div>
-            <div style="line-height: 40px; display: flex;">
-              <div style="display: flex;margin-right: 50px">
-                <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
-                <div>PX00120012312</div>
-              </div>
-              <div style="display: flex;">
-                <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
-                <div>123-446-789</div>
-              </div>
-            </div>
-
-            <div style="margin: 20px 0;font-size: 14px">
+            <div style="margin: 10px 0;font-size: 14px">
               <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
             </div>
             <div style="display: flex;align-items: center">
@@ -358,6 +360,7 @@
                 v-model="dialogForm.aaa"
                 style="width: 200px;"
                 placeholder="璇烽�夋嫨"
+                filterable
               >
                 <el-option
                   v-for="item in ARR"
@@ -366,11 +369,12 @@
                   :value="item.code"
                 />
               </el-select>
-              <div style="width: 90px;margin-left: 50px;">妫�楠屾爣鍑嗭細</div>
+              <div style="width: 90px;margin-left: 50px;">妫�楠屼汉鍛橈細</div>
               <el-select
                 v-model="dialogForm.aaa"
                 style="width: 200px;"
                 placeholder="璇烽�夋嫨"
+                filterable
               >
                 <el-option
                   v-for="item in ARR"
@@ -380,8 +384,109 @@
                 />
               </el-select>
             </div>
-            <div style="margin: 20px 0;font-size: 14px">
+            <div style="margin: 10px 0;font-size: 14px">
               <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
+            </div>
+            <div>
+              <el-button type="primary" @click="add">鏂板</el-button>
+            </div>
+            <div style="margin-top: 10px">
+              <el-table
+                :data="JYTableData"
+                :height="(tableHeight-195)+'px'"
+                border
+                stripe
+                :style="{width: 100+'%',height:tableHeight+'px',}"
+                highlight-current-row
+                :header-cell-style="this.$headerCellStyle"
+                :cell-style="this.$cellStyle"
+                @sort-change="JYsortChange"
+              >
+                <el-table-column
+                  prop="RowNum"
+                  label="搴忓彿"
+                />
+                <!--                <el-table-column-->
+                <!--                  prop="bm"-->
+                <!--                  label="妫�楠岄」鐩紪鐮�"-->
+                <!--                  sortable="custom"-->
+                <!--                />-->
+                <el-table-column
+                  prop="mc"
+                  sortable="custom"
+                  label="妫�楠岄」鐩悕绉�"
+                >
+                  <!--                  <template slot-scope="{row}">-->
+                  <!--                    <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
+                  <!--                    <div v-else> {{ row.group_code }}</div>-->
+                  <!--                  </template>-->
+                </el-table-column>
+                <el-table-column
+                  prop="ms"
+                  label="妫�楠屾爣鍑嗘弿杩�"
+                  sortable="custom"
+                >
+                  <!--                  <template slot-scope="{row}">-->
+                  <!--                    <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
+                  <!--                    <div v-else> {{ row.group_code }}</div>-->
+                  <!--                  </template>-->
+                </el-table-column>
+                <el-table-column
+                  prop="jg"
+                  label="妫�楠岀粨鏋�"
+                  sortable="custom"
+                >
+                  <template slot-scope="{row}">
+                    <div style="justify-content: flex-start ;">
+                      <el-radio v-model="radio" label="1">澶囬�夐」</el-radio>
+                      <el-radio v-model="radio" label="2">澶囬�夐」</el-radio>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="鎿嶄綔"
+                >
+                  <template slot-scope="{row}">
+                    <div class="operationClass">
+                      <el-button v-if="row.isVisible===0" type="text" @click="del(row)">鍒犻櫎</el-button>
+                      <el-button v-if="row.isVisible===1" type="text" @click="confirm(row)">纭</el-button>
+                      <el-button v-if="row.isVisible===1" type="text" @click="cancel(row)">鍙栨秷</el-button>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <!--   妫�楠岀粨鏋�   鍜�  妫�楠屽娉�      -->
+            <div style="display: flex;margin-top: 20px;align-items: center">
+
+              <div style="display: flex;margin-right: 50px;align-items: center">
+                <div style="width: 90px">妫�楠岀粨鏋滐細</div>
+                <el-select
+                  v-model="dialogForm.aaa"
+                  style="width: 200px;"
+                  placeholder="璇烽�夋嫨"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in ARR"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code"
+                  />
+                </el-select>
+              </div>
+              <div style="display: flex;">
+                <div style="width: 90px">妫�楠屽娉細</div>
+                <!--                <el-input v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
+              </div>
+
+            </div>
+
+            <div style="display: flex;margin: 20px 0;align-items: center">
+              <el-button type="primary">棣栨淇濆瓨</el-button>
+              <el-button type="primary" style="margin-left: 50px">宸℃淇濆瓨</el-button>
+              <el-button type="primary" style="margin-left: 50px">瀹屽伐妫�淇濆瓨</el-button>
+              <el-button type="info" style="margin-left: 50px">鍙栨秷</el-button>
             </div>
           </div>
         </el-tab-pane>
@@ -747,6 +852,7 @@
   SavaMesOrderStepReport
 } from '@/api/scgl'
 import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
+import { UserGroupDelete } from '@/api/jcsz'
 
 const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
@@ -890,8 +996,11 @@
         // order: 'asc', // 鎺掑簭瀛楁
         // page: 1, // 绗嚑椤�
         // rows: 20 // 姣忛〉澶氬皯鏉�
-      }
-
+      },
+      JYTableData: [
+        { RowNum: 1, bm: '001', mc: '灏哄', ms: '鏃�', jg: '鎴戞槸缁撴灉', isVisible: 0 }
+      ], // 妫�楠岄」淇℃伅琛ㄦ牸
+      radio: ''
     }
   },
   created() {
@@ -963,14 +1072,14 @@
         this.$nextTick(() => {
           this.getMesOrderStepSearch()
           $("input[name='produceCode']")[0].focus()
-          // this.WXform.orderstepqrcode = ''
+          this.WXform.orderstepqrcode = ''
         })
       }
       if (this.$refs.elTabs.currentName === '1') {
         this.$nextTick(() => {
           this.getMesOrderWxStepSearch()
           $("input[name='WXproduceCode']")[0].focus()
-          // this.form.orderstepqrcode = ''
+          this.form.orderstepqrcode = ''
         })
       }
       if (this.$refs.elTabs.currentName === '2') {
@@ -1472,6 +1581,62 @@
         this.mainHeight = window.innerHeight - 250
         this.tableHeight = this.mainHeight - 80
       })
+    },
+    /*
+  *妫�楠岄」淇℃伅
+  * */
+    JYsortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.GXform.order = order
+      this.GXform.prop = prop
+      // this.getOrganizationSearch()
+    },
+    // 鑾峰彇宸ュ簭鍒楄〃
+    // getList(){
+    //
+    // },
+    //  鏂板
+    add() {
+      // this.JYTableData.forEach(item => {
+      //   item.isVisible = 0
+      // })
+
+      let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+      number = number === 0 ? (10 + Math.random()) : number
+
+      // const data = { group_code: '', group_name: '', description: '', isVisible: 1, number: number }
+      // this.JYTableData.unshift(data)
+    },
+    // 鍒犻櫎
+    del() {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        // UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
+        //   if (res.code === '200') {
+        //     this.$message.success('鍒犻櫎鎴愬姛!')
+        //     this.getUserGroupSearch()
+        //   }
+        // })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    //  纭
+    confirm() {
+
+    },
+    //  鍙栨秷
+    cancel() {
+
     }
   }
 }
diff --git a/src/views/template.vue b/src/views/template.vue
index d59922e..04d142a 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -134,8 +134,7 @@
       @closed="handleClose"
       @close="handleClose"
     >
-      <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
-        <el-form-item label="缁勭粐绫诲瀷" prop="OrgType" />
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
         <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
           <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
         </el-form-item>
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index a0ad98a..b2b5ba2 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -157,7 +157,7 @@
 
           <el-input
             v-model="dialogForm.incbit"
-            oninput="value=value.replace(/[^0-9.]/g,'')"
+            oninput="value=value.replace(/[^0-9]/g,'')"
             style="width: 220px"
           />
         </el-form-item>
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 19e6aa0..52716fe 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -1,11 +1,497 @@
-<template />
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+      <div style="padding: 10px 5px 0 0">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="80px"
+          inline
+          style="display: flex;justify-content: space-between"
+        >
+          <div class="elForm">
+            <el-form-item label="椤圭洰缂栫爜" style=" display: flex;">
+              <el-input v-model="form.defectcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="椤圭洰鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.itemname" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+
+            <el-form-item label="椤圭洰鎻忚堪" style=" display: flex;">
+              <el-input v-model="form.itemdescr" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+          </div>
+          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+            <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+      </div>
+      <el-divider />
+      <div style="margin-left: 10px;display: flex">
+        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+      </div>
+      <el-divider />
+      <div class="elTableDiv">
+        <el-table
+          :data="tableData"
+          :height="tableHeight+'px'"
+          border
+          stripe
+          :style="{width: 100+'%',height:tableHeight+'px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          @sort-change="sortChange"
+        >
+          <!--          <el-table-column-->
+          <!--            type="selection"-->
+          <!--            width="50"-->
+          <!--          />-->
+          <el-table-column
+            prop="RowNum"
+            width="50"
+            label="搴忓彿"
+          />
+          <el-table-column
+            prop="org_code"
+            label="缁勭粐缂栫爜"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="org_name"
+            label="缁勭粐鍚嶇О"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="description"
+            label="缁勭粐绫诲瀷"
+            sortable="custom"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.description==='F'">宸ュ巶</div>
+              <div v-if="row.description==='D'">閮ㄩ棬</div>
+              <div v-if="row.description==='W'">杞﹂棿</div>
+              <div v-if="row.description==='K'">绉戝</div>
+              <div v-if="row.description==='L'">鐢熶骇绾�</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="parentorg_name"
+            label="涓婄骇鍗曚綅"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="lm_user"
+            label="鍒涘缓浜哄憳"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="lm_date"
+            label="鍒涘缓鏃堕棿"
+            sortable="custom"
+          />
+          <el-table-column
+            label="鎿嶄綔"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
+                <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="prev, pager, next,sizes"
+        popper-class="select_bottom"
+        @pagination="getDedectSearch"
+      />
+    </div>
+
+    <el-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="800px"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+        <el-form-item label="椤圭洰绫诲瀷" prop="OrgCode">
+          <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" />
+        </el-form-item>
+        <el-form-item label="椤圭洰鎻忚堪" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" type="textarea" style="width: 200px" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
 
 <script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import { DedectSearch } from '@/api/zlgl'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: 'Gxjy'
+  name: 'GXJY',
+  components: {
+    Pagination
+  },
+  data() {
+    const validateName = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+      } else {
+        if (SER_HZ.test(value)) {
+          return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+        } else {
+          callback()
+        }
+      }
+    }
+    return {
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        itemcode: '', // 椤圭洰浠ｇ爜
+        itemname: '', // 椤圭洰鍚嶇О
+        itemdescr: '', // 椤圭洰鎻忚堪
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      OrgTypeArr: [
+        { label: '宸ュ巶', value: 'F' },
+        { label: '閮ㄩ棬', value: 'D' },
+        { label: '杞﹂棿', value: 'W' },
+        { label: '绉戝', value: 'K' },
+        { label: '鐢熶骇绾�', value: 'L' }
+      ],
+
+      total: 10,
+      tableData: [],
+      dialogVisible: false,
+      dialogForm: {
+        OrgType: '',
+        OrgCode: '',
+        OrgName: '',
+        SupUnit: ''// 涓婄骇鍗曚綅
+      },
+      operation: '',
+      dialogFormRules: {
+        OrgType: [
+          { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+        ],
+        OrgCode: [
+          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+        ],
+        OrgName: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ]
+
+      }
+
+    }
+  },
+  created() {
+    this.getDedectSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    async getDedectSearch() {
+      const res = await DedectSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getDedectSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getDedectSearch()
+    },
+    upload() {
+
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.OrgCode = ''
+      this.form.OrgName = ''
+      this.form.OrgType = ''
+      this.form.UserName = ''
+      this.getDedectSearch()
+    },
+
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      this.$nextTick(() => {
+        this.dialogForm.OrgCode = row.org_code
+        this.dialogForm.OrgName = row.org_name
+        this.dialogForm.SupUnit = row.parent_id
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteOrganization({ orgid: row.code }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            this.getDedectSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.OrgType = ''
+      this.dialogForm.OrgCode = ''
+      this.dialogForm.OrgName = ''
+      this.dialogForm.SupUnit = ''
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          const data = {
+            OrganCode: this.dialogForm.OrgCode,
+            OrganName: this.dialogForm.OrgName,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+          AddUpdateOrganization(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+              this.getDedectSearch()
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 250
+        this.tableHeight = this.mainHeight - 100
+      })
+    }
+  }
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+  background-color: $main_color !important;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  //border: 1px solid $main_color;
+  border: none;
+  padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+  border: none;
+}
+::v-deep .el-button--info {
+  height: 30px;
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.footerButton {
+  display: flex;
+  justify-content: end;
+}
+
+::v-deep .el-button--default {
+  background-color: #ffffff !important;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+}
+
+::v-deep .el-button--default:hover {
+  color: #606266;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+  background-color: $main_color;
+  border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+  color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+  border-color: $main_color;
+  background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+  height: 30px;
+  line-height: 30px;
+}
+::v-deep .el-input__inner:focus {
+  border-color: $main_color;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+  color: $main_color;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.operationClass {
+  height: 23px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.el-icon-share {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+  border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+  border-color: $main_color;
+  background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  border-color: $main_color;
+  background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+  color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+  margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+  color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+  margin: 10px 30px 0px 0;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+  border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+  border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+  color: $main_color;
+}
+::v-deep .el-checkbox__inner:hover{
+  border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+  border-color: $main_color;
+}
 
 </style>
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 3771ee6..9eee958 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -1,11 +1,497 @@
-<template />
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+      <div style="padding: 10px 5px 0 0">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="80px"
+          inline
+          style="display: flex;justify-content: space-between"
+        >
+          <div class="elForm">
+            <el-form-item label="缂洪櫡浠ｇ爜" style=" display: flex;">
+              <el-input v-model="form.defectcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="缂洪櫡鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.defectname" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+
+            <el-form-item label="缂洪櫡鎻忚堪" style=" display: flex;">
+              <el-input v-model="form.defectdescr" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+          </div>
+          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+            <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+      </div>
+      <el-divider />
+      <div style="margin-left: 10px;display: flex">
+        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+      </div>
+      <el-divider />
+      <div class="elTableDiv">
+        <el-table
+          :data="tableData"
+          :height="tableHeight+'px'"
+          border
+          stripe
+          :style="{width: 100+'%',height:tableHeight+'px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          @sort-change="sortChange"
+        >
+          <!--          <el-table-column-->
+          <!--            type="selection"-->
+          <!--            width="50"-->
+          <!--          />-->
+          <el-table-column
+            prop="RowNum"
+            width="50"
+            label="搴忓彿"
+          />
+          <el-table-column
+            prop="org_code"
+            label="缁勭粐缂栫爜"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="org_name"
+            label="缁勭粐鍚嶇О"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="description"
+            label="缁勭粐绫诲瀷"
+            sortable="custom"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.description==='F'">宸ュ巶</div>
+              <div v-if="row.description==='D'">閮ㄩ棬</div>
+              <div v-if="row.description==='W'">杞﹂棿</div>
+              <div v-if="row.description==='K'">绉戝</div>
+              <div v-if="row.description==='L'">鐢熶骇绾�</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="parentorg_name"
+            label="涓婄骇鍗曚綅"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="lm_user"
+            label="鍒涘缓浜哄憳"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="lm_date"
+            label="鍒涘缓鏃堕棿"
+            sortable="custom"
+          />
+          <el-table-column
+            label="鎿嶄綔"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
+                <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="prev, pager, next,sizes"
+        popper-class="select_bottom"
+        @pagination="getDedectSearch"
+      />
+    </div>
+
+    <el-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="800px"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+        <el-form-item label="缂洪櫡绫诲瀷" prop="OrgCode">
+          <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" />
+        </el-form-item>
+        <el-form-item label="缂洪櫡鎻忚堪" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" type="textarea" style="width: 200px" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
 
 <script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import { DedectSearch } from '@/api/zlgl'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: 'Dyqx'
+  name: 'QXDY',
+  components: {
+    Pagination
+  },
+  data() {
+    const validateName = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+      } else {
+        if (SER_HZ.test(value)) {
+          return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+        } else {
+          callback()
+        }
+      }
+    }
+    return {
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        defectcode: '', // 缂洪櫡浠ｇ爜
+        defectname: '', // 缂洪櫡鍚嶇О
+        defectdescr: '', // 缂洪櫡鎻忚堪
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      OrgTypeArr: [
+        { label: '宸ュ巶', value: 'F' },
+        { label: '閮ㄩ棬', value: 'D' },
+        { label: '杞﹂棿', value: 'W' },
+        { label: '绉戝', value: 'K' },
+        { label: '鐢熶骇绾�', value: 'L' }
+      ],
+
+      total: 10,
+      tableData: [],
+      dialogVisible: false,
+      dialogForm: {
+        OrgType: '',
+        OrgCode: '',
+        OrgName: '',
+        SupUnit: ''// 涓婄骇鍗曚綅
+      },
+      operation: '',
+      dialogFormRules: {
+        OrgType: [
+          { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+        ],
+        OrgCode: [
+          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+        ],
+        OrgName: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ]
+
+      }
+
+    }
+  },
+  created() {
+    this.getDedectSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    async getDedectSearch() {
+      const res = await DedectSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getDedectSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getDedectSearch()
+    },
+    upload() {
+
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.OrgCode = ''
+      this.form.OrgName = ''
+      this.form.OrgType = ''
+      this.form.UserName = ''
+      this.getDedectSearch()
+    },
+
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      this.$nextTick(() => {
+        this.dialogForm.OrgCode = row.org_code
+        this.dialogForm.OrgName = row.org_name
+        this.dialogForm.SupUnit = row.parent_id
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteOrganization({ orgid: row.code }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            this.getDedectSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.OrgType = ''
+      this.dialogForm.OrgCode = ''
+      this.dialogForm.OrgName = ''
+      this.dialogForm.SupUnit = ''
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          const data = {
+            OrganCode: this.dialogForm.OrgCode,
+            OrganName: this.dialogForm.OrgName,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+          AddUpdateOrganization(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+              this.getDedectSearch()
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 250
+        this.tableHeight = this.mainHeight - 100
+      })
+    }
+  }
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+  background-color: $main_color !important;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  //border: 1px solid $main_color;
+  border: none;
+  padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+  border: none;
+}
+::v-deep .el-button--info {
+  height: 30px;
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.footerButton {
+  display: flex;
+  justify-content: end;
+}
+
+::v-deep .el-button--default {
+  background-color: #ffffff !important;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+}
+
+::v-deep .el-button--default:hover {
+  color: #606266;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+  background-color: $main_color;
+  border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+  color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+  border-color: $main_color;
+  background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+  height: 30px;
+  line-height: 30px;
+}
+::v-deep .el-input__inner:focus {
+  border-color: $main_color;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+  color: $main_color;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.operationClass {
+  height: 23px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.el-icon-share {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+  border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+  border-color: $main_color;
+  background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  border-color: $main_color;
+  background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+  color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+  margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+  color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+  margin: 10px 30px 0px 0;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+  border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+  border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+  color: $main_color;
+}
+::v-deep .el-checkbox__inner:hover{
+  border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+  border-color: $main_color;
+}
 
 </style>
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 8cfed2f..51ff850 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -169,10 +169,12 @@
           <el-table-column
             label="宸ヨ壓璺嚎"
             width="80"
+            prop="proute_id"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <i class="el-icon-share" @click="routeClick(row)" />
+                <i v-if="row.proute_id==='Y'" class="el-icon-share" @click="routeClick(row)" />
+                <i v-if="row.proute_id==='N'" style="color: #E4E7ED" class="el-icon-share" @click="routeClick(row)" />
               </div>
             </template>
           </el-table-column>
@@ -237,23 +239,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="鎵�灞炰粨搴�" prop="warehousecode">
-          <el-select
-            v-model="dialogForm.warehousecode"
-            filterable
-            :popper-append-to-body="false"
-            style="width: 200px"
-            placeholder="璇烽�夋嫨"
-          >
-            <!--            @focus="getWareHouseSelect2"-->
-            <el-option
-              v-for="item in storehouseArr"
-              :key="item.code"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-        </el-form-item>
         <el-form-item label="瀛樿揣绫诲瀷" prop="stocktypecode">
           <el-select
             v-model="dialogForm.stocktypecode"
@@ -266,6 +251,23 @@
 
             <el-option
               v-for="item in stocktypeArr"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鎵�灞炰粨搴�" prop="warehousecode">
+          <el-select
+            v-model="dialogForm.warehousecode"
+            filterable
+            :popper-append-to-body="false"
+            style="width: 200px"
+            placeholder="璇烽�夋嫨"
+          >
+            <!--            @focus="getWareHouseSelect2"-->
+            <el-option
+              v-for="item in storehouseArr"
               :key="item.code"
               :label="item.name"
               :value="item.code"
@@ -289,11 +291,12 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="鏈�灏忓簱瀛�" prop="minstockqty">
-          <el-input v-model="dialogForm.minstockqty" style="width: 200px" />
-        </el-form-item>
+
         <el-form-item label="鏈�澶у簱瀛�" prop="maxstockqty">
-          <el-input v-model="dialogForm.maxstockqty" style="width: 200px" />
+          <el-input v-model="dialogForm.maxstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
+          <el-form-item label="鏈�灏忓簱瀛�" prop="minstockqty" style="margin-left: 10px">
+            <el-input v-model="dialogForm.minstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
+          </el-form-item>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -362,7 +365,12 @@
           sortable="custom"
         >
           <template slot-scope="{row}">
-            <el-input v-if="row.isVisible===1" v-model="row.digdect" placeholder="璇疯緭鍏�" />
+            <el-input
+              v-if="row.isVisible===1"
+              v-model="row.digdect"
+              oninput="value=value.replace(/[^0-9]/g,'')"
+              placeholder="璇疯緭鍏�"
+            />
             <div v-else> {{ row.digdect }}</div>
           </template>
         </el-table-column>
@@ -600,21 +608,21 @@
         uomcode: [
           { required: true, message: '璇烽�夋嫨浣跨敤鍗曚綅', trigger: ['blur', 'change'] }
         ],
-        warehousecode: [
-          { required: true, message: '璇烽�夋嫨鎵�灞炰粨搴�', trigger: ['blur', 'change'] }
-        ],
+        // warehousecode: [
+        //   { required: true, message: '璇烽�夋嫨鎵�灞炰粨搴�', trigger: ['blur', 'change'] }
+        // ],
         stocktypecode: [
           { required: true, message: '璇烽�夋嫨瀛樿揣绫诲瀷', trigger: ['blur', 'change'] }
         ],
         materialtypecode: [
           { required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨�', trigger: ['blur', 'change'] }
-        ],
-        minstockqty: [
-          { required: true, message: '璇疯緭鍏ユ渶灏忓簱瀛�', trigger: ['blur', 'change'] }
-        ],
-        maxstockqty: [
-          { required: true, message: '璇疯緭鍏ユ渶澶у簱瀛�', trigger: ['blur', 'change'] }
         ]
+        // minstockqty: [
+        //   { required: true, message: '璇疯緭鍏ユ渶灏忓簱瀛�', trigger: ['blur', 'change'] }
+        // ],
+        // maxstockqty: [
+        //   { required: true, message: '璇疯緭鍏ユ渶澶у簱瀛�', trigger: ['blur', 'change'] }
+        // ]
 
       },
       officeDialogVisible: false,
@@ -722,7 +730,7 @@
     async   edit(operation, row) {
       this.operation = operation
       this.dialogVisible = true
-      await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
+      // await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
       this.$nextTick(() => {
         this.dialogForm.id = row.id
         this.dialogForm.materialcode = row.partcode
@@ -783,8 +791,8 @@
             warehousecode: this.dialogForm.warehousecode,
             stocktypecode: this.dialogForm.stocktypecode,
             materialtypecode: this.dialogForm.materialtypecode,
-            minstockqty: this.dialogForm.minstockqty,
-            maxstockqty: this.dialogForm.maxstockqty,
+            minstockqty: this.dialogForm.minstockqty === '' ? 0 : this.dialogForm.minstockqty,
+            maxstockqty: this.dialogForm.maxstockqty === '' ? 0 : this.dialogForm.maxstockqty,
             OperType: this.operation === 'add' ? 'Add' : 'Update'
           }
           AddUpdateInventoryFile(data).then(res => {
@@ -949,6 +957,7 @@
       const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, data)
       if (res.code === '200') {
         this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getInventoryFileSelect()
         this.dialogVisibleRoute = false
       }
     },
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index 2b86451..f6aef7c 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -128,19 +128,23 @@
           />
           <el-table-column
             label="鍏宠仈宸ヤ綔绔�"
+            prop="is_eqp"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <i class="el-icon-share" @click="workClick(row)" />
+                <i v-if="row.is_eqp==='Y'" class="el-icon-share" @click="workClick(row)" />
+                <i v-if="row.is_eqp==='N'" class="el-icon-share" style="color: #E4E7ED" @click="workClick(row)" />
               </div>
             </template>
           </el-table-column>
           <el-table-column
             label="鍏宠仈缂洪櫡"
+            prop="is_defect"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <i class="el-icon-share" @click="defectClick(row)" />
+                <i v-if="row.is_defect==='Y'" class="el-icon-share" @click="defectClick(row)" />
+                <i v-if="row.is_defect==='N'" class="el-icon-share" style="color: #E4E7ED;" @click="defectClick(row)" />
               </div>
             </template>
           </el-table-column>
@@ -409,7 +413,7 @@
         'stepcode': '',
         'stepname': '',
         'steptypecode': '',
-        'enable': '',
+        'enable': 'Y',
         'description': '',
         'OperType': ''
       },
@@ -534,7 +538,7 @@
       this.dialogForm.stepcode = ''
       this.dialogForm.stepname = ''
       this.dialogForm.steptypecode = ''
-      this.dialogForm.enable = ''
+      this.dialogForm.enable = 'Y'
       this.dialogForm.description = ''
       this.$refs.dialogForm.clearValidate()
     },
@@ -806,7 +810,7 @@
         console.log('3.绗笁绉嶆儏鍐�  鍗婂彾涓洪浂  鍏ㄥ彾涓嶄负闆�')
         console.log(obj.code, 12)
         this.workDialogForm.workGatherArr.forEach((item, index) => {
-          if (item.code === obj.code) {
+          if (item.code === checkedFatherCode) {
             this.workDialogForm.workGatherArr[index].isSelected2 = true
             this.workDialogForm.workCodeSelectedGatherArr.push(obj.code)
             this.$nextTick(() => {
@@ -863,6 +867,7 @@
       const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, data)
       if (res.code === '200') {
         this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getStepSearch()
         this.workDialogVisible = false
       }
     },
@@ -909,6 +914,7 @@
       const res = await SaveStepAssociationDefect(this.defectTreeCode, data)
       if (res.code === '200') {
         this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getStepSearch()
         this.defectDialogVisible = false
       }
     }
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index e31a9b6..6add50d 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -5,12 +5,12 @@
         <el-form
           ref="form"
           :model="form"
-          label-width="80px"
+          label-width="100px"
           inline
           style="display: flex;justify-content: space-between"
         >
           <div class="elForm">
-            <el-form-item label="宸ヨ壓缂栫爜" style=" display: flex;">
+            <el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">
               <el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="宸ヨ壓鍚嶇О" style=" display: flex;">
@@ -127,9 +127,9 @@
       @closed="handleClose"
       @close="handleClose"
     >
-      <el-form ref="dialogForm" style="height: 500px" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+      <el-form ref="dialogForm" style="height: 500px" :rules="dialogFormRules" :model="dialogForm" label-width="110px">
         <div style="display: flex">
-          <el-form-item label="宸ヨ壓缂栫爜" prop="code" style="margin-right: 20px">
+          <el-form-item label="宸ヨ壓璺嚎缂栫爜" prop="code" style="margin-right: 20px">
             <el-input v-model="dialogForm.code" :disabled="operation!=='add'" style="width: 220px" />
           </el-form-item>
           <el-form-item label="宸ヨ壓鍚嶇О" prop="name">
@@ -303,7 +303,7 @@
         id: '',
         code: '',
         name: '',
-        enable: '',
+        enable: 'Y',
         description: '',
         Data: []
       },
@@ -316,7 +316,7 @@
       selectedName: '', // 閫変腑鐨勫悕绉�
       autocompleteValue: '', // 鍙悳绱㈣緭鍏ユ涓殑鍊�
       routeArr: [], // 宸ヨ壓璁剧疆涓嬫媺鎵�鏈夊��
-      addDisabled: false, // 娣诲姞鎸夐挳鏄惁鍙偣鍑�
+      addDisabled: true, // 娣诲姞鎸夐挳鏄惁鍙偣鍑�
       editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
       mouseFocusPosition: 0, // 榧犳爣鑱氱劍鐨勪綅缃�
       operation: '',
@@ -399,6 +399,9 @@
           flag2 = true
         }
       })
+      if (tag.stepname === this.autocompleteValue.trim()) {
+        flag2 = false
+      }
       if (flag2) {
         return this.$message.info('姝ゅ伐搴忓凡閫夛紝璇烽�夋嫨鍏跺畠宸ュ簭锛�')
       }
@@ -597,12 +600,13 @@
     handleClose() {
       this.dialogForm.code = ''
       this.dialogForm.name = ''
-      this.dialogForm.enable = ''
+      this.dialogForm.enable = 'Y'
       this.dialogForm.description = ''
       this.dialogForm.Data = []
       this.dynamicTags = [
         { editDisabled: true, stepcode: 'Step01', seq: 1, stepname: ' ', effect: 'light' }
       ]
+      this.addDisabled = true
       this.$refs.dialogForm.clearValidate()
     },
     // 瀵硅瘽妗嗗彇娑�
@@ -704,8 +708,11 @@
   color: #606266;
 }
 
+//::v-deep .el-dialog__body {
+//  padding: 20px 100px !important;
+//}
 ::v-deep .el-dialog__body {
-  padding: 20px 100px !important;
+  padding: 20px 60px !important;
 }
 
 ::v-deep .el-radio__input.is-checked .el-radio__inner {
@@ -828,8 +835,8 @@
   position: absolute;
   margin-left: -7px;
   z-index: 2;
-  width: 15px;
-  height: 15px !important;
+  width: 16px;
+  height: 16px !important;
   font-size: 12px;
   text-align: center;
   line-height: 15px;

--
Gitblit v1.9.3