Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -190,6 +190,7 @@ export default {
           sfggcl: '1'
           sfggcl: '1'
         }
         }
       )
       )
+      this.key++
     },
     },
     handleSelectGgcl (item) {
     handleSelectGgcl (item) {
       if (item.sfggcl == '1') {
       if (item.sfggcl == '1') {

@@ -72,13 +72,8 @@ export default {
           render: (h, scope) => {
           render: (h, scope) => {
             return (
             return (
               <div>
               <div>
-                <el-input placeholder="登记情形编码" v-show={scope.row.nodecodeShow} v-fo class={{ repeat: scope.row.repeat }} disabled={scope.row.sftsdjqx == '1'}
-                  value={scope.row[scope.column.property]} onFocus={() => { this.itemShowFalse(); scope.row.nodecodeShow = true; }}
-                  onInput={(val) => { scope.row[scope.column.property] = val }} onBlur={() => { this.nodecodeBlur(scope.$index, scope.row) }} maxlength="8">
-                </el-input>
-
-                <el-input placeholder="登记情形编码" v-show={!scope.row.nodecodeShow} class={{ repeat: scope.row.repeat }} disabled={scope.row.sftsdjqx == '1'}
-                  value={scope.row[scope.column.property]} onFocus={() => { this.itemShowFalse(); scope.row.nodecodeShow = true; }}
+                <el-input placeholder="登记情形编码" class={{ repeat: scope.row.repeat }} disabled={scope.row.sftsdjqx == '1'}
+                  value={scope.row[scope.column.property]}
                   onInput={(val) => { scope.row[scope.column.property] = val }} onBlur={() => { this.nodecodeBlur(scope.$index, scope.row) }} maxlength="8">
                   onInput={(val) => { scope.row[scope.column.property] = val }} onBlur={() => { this.nodecodeBlur(scope.$index, scope.row) }} maxlength="8">
                 </el-input>
                 </el-input>
               </div>
               </div>
@@ -91,11 +86,8 @@ export default {
           render: (h, scope) => {
           render: (h, scope) => {
             return (
             return (
               <div>
               <div>
-                <el-input placeholder="登记情形名称" v-show={scope.row.nodenameShow} v-fo disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]}
-                  onInput={(val) => { scope.row[scope.column.property] = val }}
-                  onFocus={() => { this.itemShowFalse(); scope.row.nodenameShow = true; }}></el-input>
-                <el-input placeholder="登记情形名称" v-show={!scope.row.nodenameShow} disabled={scope.row.sftsdjqx == '1'}
-                  onFocus={() => { this.itemShowFalse(); scope.row.nodenameShow = true; }} value={scope.row[scope.column.property]}
+                <el-input placeholder="登记情形名称" disabled={scope.row.sftsdjqx == '1'}
+                  value={scope.row[scope.column.property]}
                   onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
                   onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
               </div>
               </div>
             )
             )
@@ -119,12 +111,8 @@ export default {
           render: (h, scope) => {
           render: (h, scope) => {
             return (
             return (
               <div>
               <div>
-                <el-input placeholder="登记原因模板" v-show={scope.row.djyyShow} v-fo disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]}
-                  onInput={(val) => { scope.row[scope.column.property] = val }}
-                  onFocus={() => { this.itemShowFalse(); scope.row.djyyShow = true; }}></el-input>
-                <el-input placeholder="登记原因模板" v-show={!scope.row.djyyShow} v-fo disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]}
-                  onInput={(val) => { scope.row[scope.column.property] = val }}
-                  onFocus={() => { this.itemShowFalse(); scope.row.djyyShow = true; }}></el-input>
+                <el-input placeholder="登记原因模板" disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]}
+                  onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
               </div>
               </div>
 
 
             )
             )
@@ -193,60 +181,25 @@ export default {
     // 添加索引
     // 添加索引
     addIndexes (data = this.tableData, isAdd = true) {
     addIndexes (data = this.tableData, isAdd = true) {
       data.forEach((item, index) => {
       data.forEach((item, index) => {
-        if (index == 0) {
-          item.nodecodeShow = true
-          item.nodenameShow = false
-          item.djyyShow = false
-        } else {
-          item.nodecodeShow = false
-          item.nodenameShow = false
-          item.djyyShow = false
-        }
         if (isAdd) {
         if (isAdd) {
           item.index = index + 1
           item.index = index + 1
         }
         }
       })
       })
     },
     },
-    itemShowFalse () {
-      this.tableData.length > 0 && this.tableData.forEach((item, index) => {
-        item.nodecodeShow = true
-        item.nodenameShow = false
-        item.djyyShow = false
-      })
-    },
     handleAdd () {
     handleAdd () {
       this.$nextTick(() => {
       this.$nextTick(() => {
         let container = this.$el.querySelector('.el-table__body-wrapper');
         let container = this.$el.querySelector('.el-table__body-wrapper');
         container.scrollTop = container.scrollHeight;
         container.scrollTop = container.scrollHeight;
       })
       })
-      if (this.djqx.length > 0) {
-        let code = this.tableData.slice(-1)[0].nodecode
-        let codeQ = code.slice(0, 6)
-        let len = ''
-        if (this.tableData.length + 1 < 9) {
-          len = 0 + String(this.tableData.length + 1)
-        } else {
-          len = this.tableData.length + 1
-        }
       this.tableData.push(
       this.tableData.push(
         {
         {
-            nodecode: codeQ + len,
+          nodecode: '',
           nodename: '',
           nodename: '',
           enabled: '1',
           enabled: '1',
           djyy: '',
           djyy: '',
           sfqydjyymb: '0'
           sfqydjyymb: '0'
         }
         }
       )
       )
-      } else {
-        this.tableData.push(
-          {
-            nodename: '',
-            enabled: '1',
-            djyy: '',
-            sfqydjyymb: '0'
-          }
-        )
-      }
       this.addIndexes()
       this.addIndexes()
       this.key++
       this.key++
     },
     },

@@ -240,13 +240,13 @@ export default {
       this.getSqdjywDetail(obj.bsmSqyw)
       this.getSqdjywDetail(obj.bsmSqyw)
     },
     },
     getDjqxValue (val) {
     getDjqxValue (val) {
-      if (_.isEqual(val.djqx, this.subData.djqx)) {
+      if (!_.isEqual(val.djqx, this.subData.djqx)) {
         this.subData.djqx = val.djqx
         this.subData.djqx = val.djqx
         this.btnDisabled = val.btnDisabled
         this.btnDisabled = val.btnDisabled
       }
       }
     },
     },
     getClgzValue (val) {
     getClgzValue (val) {
-      if (_.isEqual(val, this.subData.clxx)) {
+      if (!_.isEqual(val, this.subData.clxx)) {
         this.subData.clxx = val
         this.subData.clxx = val
       }
       }
     },
     },

@@ -270,7 +270,7 @@ export default {
     @include flex;
     @include flex;
     width: 100%;
     width: 100%;
     height: 80px;
     height: 80px;
-    background-color: #10CCB8;
+    background-color: #3498DB;
     color: #ffffff;
     color: #ffffff;
     justify-content: space-between;
     justify-content: space-between;
     padding-left: 15px;
     padding-left: 15px;
@@ -294,11 +294,11 @@ export default {
       li:hover {
       li:hover {
         border: 1px solid #ffffff;
         border: 1px solid #ffffff;
         border-radius: 5px;
         border-radius: 5px;
-        color: $light-blue ;
+        //color: $light-blue ;
 
 
 
 
         .svg-icon {
         .svg-icon {
-          color: $light-blue ;
+          //color: $light-blue ;
         }
         }
       }
       }
     }
     }

@@ -4,13 +4,13 @@
   </dialogBox>
   </dialogBox>
 </template>
 </template>
 <script>
 <script>
-import {queueDjywmc} from './fqsqdata.js';
+import { queueDjywmc } from './fqsqdata.js';
 export default {
 export default {
   props: {
   props: {
     value: { type: Boolean, default: true },
     value: { type: Boolean, default: true },
     bsmSqyw: { type: String, default: '' },
     bsmSqyw: { type: String, default: '' },
     djywbm: { type: String, default: '' },
     djywbm: { type: String, default: '' },
-    djqxObj:{type: Object, default: ''}
+    djqxObj: { type: Object, default: '' }
   },
   },
   data () {
   data () {
     return {
     return {
@@ -23,9 +23,7 @@ export default {
       this.myValue = val
       this.myValue = val
     },
     },
     djywbm (val) {
     djywbm (val) {
-      //let itemObj = { 'A03100': 'scdj','A37100': 'scdy','B39800':'cfdj', default: 'scdj' };
-     // this.editItem = this.loadView(itemObj[val]);
-      let dd=queueDjywmc(val);
+      let dd = queueDjywmc(val);
       this.editItem = this.loadView(dd);
       this.editItem = this.loadView(dd);
     },
     },
   },
   },
@@ -37,13 +35,13 @@ export default {
     closeDialog () {
     closeDialog () {
       this.$emit("input", false);
       this.$emit("input", false);
     }
     }
-    
-  },
+  }
 };
 };
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";
+
 /deep/.submit_button {
 /deep/.submit_button {
   text-align: center;
   text-align: center;
   padding: 10px;
   padding: 10px;