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

@@ -58,10 +58,10 @@
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./jtfcdata";
 import { datas, sendThis } from "./jtfcdata";
 import { getJtfcPage } from "@/api/jtfc";
 import { getJtfcPage } from "@/api/jtfc";
-import editDialog from "../components/editDialog.vue";
+import addjtfc from "./components/addjtfc.vue";
 export default {
 export default {
   name: "jtfc",
   name: "jtfc",
-  components: { editDialog },
+  components: { addjtfc },
   mixins: [table],
   mixins: [table],
   mounted() {
   mounted() {
     sendThis(this);
     sendThis(this);

@@ -47,11 +47,11 @@
         :column="tableData.columns" :data="tableData.data">
         :column="tableData.columns" :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
-    <editDialog v-model="isDialog" />
+    <!-- <editDialog v-model="isDialog" /> -->
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import editDialog from "../components/editDialog.vue"
+// import editDialog from "../components/editDialog.vue"
 import table from "@/utils/mixin/table"
 import table from "@/utils/mixin/table"
 import { datas, sendThis } from "./sqcxjldata"
 import { datas, sendThis } from "./sqcxjldata"
 import { getJtfcPage } from '@/api/sqcx'
 import { getJtfcPage } from '@/api/sqcx'

@@ -38,7 +38,7 @@
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：">
-              <el-input disabled v-model="ruleForm.djqxmc"></el-input>
+              <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>

@@ -38,7 +38,7 @@
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：">
-              <el-input disabled v-model="ruleForm.djqxmc"></el-input>
+              <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>

@@ -67,6 +67,7 @@ export default {
   },
   },
   mounted () {
   mounted () {
     sendThis(this);
     sendThis(this);
+    console.log(Cookies.get("bsmSqyw"))  ;
   },
   },
   methods: {
   methods: {
     closeDialog () {
     closeDialog () {

@@ -127,7 +127,7 @@ export default {
       }))
       }))
       if (item.sffqlc == '1') {
       if (item.sffqlc == '1') {
         this.btnDisabled = false
         this.btnDisabled = false
-        Cookies.set("bsmSqyw", item.parentid)
+        Cookies.set("bsmSqyw", item.bsmSqyw)
         this.djywbm = item.djywbm
         this.djywbm = item.djywbm
       }
       }
     },
     },