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

 /*
  * @Description: 企业银行接口
  * @Autor: renchao
- * @LastEditTime: 2023-09-08 09:18:45
+ * @LastEditTime: 2023-09-11 10:19:36
  */
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -64,3 +64,20 @@ export function uploadBatch (data) {
     data
   })
 }
+
+
+
+/**
+ * @description: 删除上传材料目录
+ * @param {*} bsmFile
+ * @author: renchao
+ */
+export function deleteFile (bsmFile) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/company/deleteFile',
+    method: 'get',
+    params: {
+      bsmFile: bsmFile
+    }
+  })
+}
\ No newline at end of file

 /*
  * @Description: 信息备案
  * @Autor:
- * @LastEditTime: 2023-09-08 09:27:58
+ * @LastEditTime: 2023-09-11 11:25:22
  */
 
 import request from '@/utils/request'
@@ -19,6 +19,19 @@ export function addYh (data) {
     data
   })
 }
+
+/**
+ * @description: 编辑银行
+ * @param {*} data
+ * @author:
+ */
+export function update (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/company/update',
+    method: 'post',
+    data
+  })
+}
 /**
  * @description: 添加企业
  * @param {*} data

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 16:08:48
+ * @LastEditTime: 2023-09-11 10:01:32
 -->
 <template>
   <el-image-viewer :on-close="closeViewer" :url-list="urlList">

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-08-15 10:01:26
+ * @LastEditTime: 2023-09-11 10:18:11
 -->
 <template>
   <transition name="msgbox-fade">
@@ -158,7 +158,7 @@
   }
 
   .mask-content {
-    padding: 5px 20px 50px 20px;
+    padding: 5px 20px 30px 20px;
     width: 100%;
     min-height: 20%;
     max-height: 90vh;

@@ -40,7 +40,6 @@ export default class filter {
     let status = { 1: '正常申请', 2: '一并申请', 3: '补录申请' }
     return status[val]
   }
-  // 字典
   /**
    * @description: 字典
    * @param {*} val

 /*
  * @Description: 弹框组件的封装
  * @Autor: renchao
- * @LastEditTime: 2023-07-12 09:58:13
+ * @LastEditTime: 2023-09-11 10:38:44
  */
 import ywPopup from '@/components/ywPopup/index'
 import Popup1 from '@/components/Popup1/index'
@@ -49,7 +49,7 @@ export function popupDialog (title, url, params, width = '75%', isMain, height,
  * @param {*} cancel
  * @author: renchao
  */
-export function ywPopupDialog (title, url, params, width = '75%', isMain, height, btnShow = true, callback, cancel) {
+export function ywPopupDialog (title, url, params, width = '75%', isMain, btnShow = true, height, callback, cancel) {
   // Popup.install
   ywPopup(title, url, {
     height: height,
@@ -63,7 +63,7 @@ export function ywPopupDialog (title, url, params, width = '75%', isMain, height
     confirm: () => {
       callback()
     },
-    popupDialog: popupDialog // 将 popupDialog 方法传递给弹框组件
+    popupDialog: ywPopupDialog // 将 popupDialog 方法传递给弹框组件
   })
 }
 
@@ -80,5 +80,5 @@ export function popupCacel () {
  * @author: renchao
  */
 export function ywPopupCacel () {
-  ywPopupDialog().close()
+  ywPopup().close()
 }

@@ -49,6 +49,10 @@ export default {
     this.dealCheckedItem();
   },
   methods: {
+    /**
+     * @description: submitForm
+     * @author: renchao
+     */
     submitForm () {
       var checkedNodes = this.$refs.tree.getCheckedNodes();
       if (checkedNodes.length > 6) {
@@ -65,6 +69,10 @@ export default {
         }
       })
     },
+    /**
+     * @description: queryClick
+     * @author: renchao
+     */
     queryClick () {
       let that = this
       getMenuInfo().then(res => {
@@ -79,13 +87,28 @@ export default {
       }
       this.defaultCheckeds = lookForAllId()
     },
+    /**
+     * @description: dealCheckedItem
+     * @author: renchao
+     */
     dealCheckedItem () {
     },
     //关闭窗口
+    /**
+     * @description: 关闭窗口
+     * @author: renchao
+     */
     closeDialog () {
       this.$emit("input", false);
     },
     //节点选择状态发生改变时
+    /**
+     * @description: 节点选择状态发生改变时
+     * @param {*} data
+     * @param {*} checked
+     * @param {*} node
+     * @author: renchao
+     */
     handleClick (data, checked, node) {
       var checkedNodes = this.$refs.tree.getCheckedNodes();
       if (checkedNodes.length > 6) {

@@ -75,6 +75,10 @@
     },
     methods: {
       // 初始化数据
+      /**
+       * @description: 初始化数据
+       * @author: renchao
+       */
       queryClick () {
         this.$startLoading();
         getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-01 14:09:02
+ * @LastEditTime: 2023-09-11 15:44:33
 -->
 <template>
   <dialogBox
@@ -16,8 +16,8 @@
 
     <el-tabs v-model="activeName" @tab-click="handleClick" class="from-clues-header">
       <el-tab-pane label="基本信息" name="1"></el-tab-pane>
-      <el-tab-pane label="银行机构" name="2"></el-tab-pane>
-      <el-tab-pane label="企业信息" name="3"></el-tab-pane>
+      <el-tab-pane label="企业信息" name="2"></el-tab-pane>
+      <el-tab-pane label="银行机构" name="3"></el-tab-pane>
     </el-tabs>
 
     <el-form
@@ -254,105 +254,93 @@
       </el-row>
     </el-form>
     <div v-if="activeName==2" class="padding10">
-      <el-form :model="queryForm" label-width="80px">
+      <el-form :model="queryFormQY" label-width="80px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="证件号">
-              <el-input placeholder="证件号" maxlength="28" v-model="queryForm.zjh" clearable class="width100">
+            <el-form-item label="姓名/名称">
+              <el-input placeholder="姓名/名称" v-model="queryFormQY.qymc" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="姓名/名称">
-              <el-input placeholder="" v-model.trim="queryForm.sqrmc" clearable class="width100">
+            <el-form-item label="证件号">
+              <el-input placeholder="证件号" v-model="queryFormQY.zjh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="handleSearchQY">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-table :data="tableDataYh.data" border v-Loading="loading" :height="426.8">
-        <el-table-column v-for="item in tableDataYh.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
-        </el-table-column>
-        <el-table-column label="证件种类">
+      <el-table :data="tableDataQy.data" border v-Loading="loading" :height="426.8">
+        <el-table-column label="序号" type="index" width="50" align="center">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.zjh" placeholder="请选择">
-              <el-option
-                v-for="item in dictData['A30']"
-                :key="item.dcode"
-                :label="item.dname"
-                :value="item.dcode">
-              </el-option>
-            </el-select>
+            {{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}}
           </template>
         </el-table-column>
+        <el-table-column v-for="item in tableDataQy.columns" :key="item.index" :width="item.width" :prop="item.prop" :label="item.label" align="center">
+        </el-table-column>
         <el-table-column label="操作" width="50">
           <template slot-scope="scope">
-            <el-button type="text" @click="handlesYhSelect(scope.row)">使用</el-button>
+            <el-button type="text" @click="handlesQYSelect(scope.row)">使用</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination background layout="prev, pager, next,total" :total="tableDataYh.total"
-        @current-change="handleCurrentChange"></el-pagination>
+      <el-pagination background layout="prev, pager, next,total" :total="tableDataQy.total"
+        @current-change="handleQYCurrentChange"></el-pagination>
 
     </div>
 
     <div v-if="activeName==3" class="padding10">
-      <el-form :model="queryForm" label-width="80px">
+      <el-form :model="queryFormYH" label-width="80px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="证件号">
-              <el-input placeholder="证件号" maxlength="28" v-model="queryForm.zjh" clearable class="width100">
+            <el-form-item label="姓名/名称">
+              <el-input placeholder="姓名/名称" v-model="queryFormYH.qymc" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="姓名/名称">
-              <el-input placeholder="" v-model.trim="queryForm.sqrmc" clearable class="width100">
+            <el-form-item label="证件号">
+              <el-input placeholder="证件号" v-model="queryFormYH.zjh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="handleSearchYH">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-table :data="tableDataQy.data" border v-Loading="loading" :height="426.8">
-        <el-table-column v-for="item in tableDataQy.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
-        </el-table-column>
-        <el-table-column label="证件种类">
+      <el-table :data="tableDataYh.data" border v-Loading="loading" :height="426.8">
+        <el-table-column label="序号" type="index" width="50" align="center">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.zjh" placeholder="请选择">
-              <el-option
-                v-for="item in dictData['A30']"
-                :key="item.dcode"
-                :label="item.dname"
-                :value="item.dcode">
-              </el-option>
-            </el-select>
+            {{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}}
           </template>
         </el-table-column>
+        <el-table-column v-for="item in tableDataYh.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
+        </el-table-column>
         <el-table-column label="操作" width="50">
           <template slot-scope="scope">
-            <el-button type="text" @click="handlesYhSelect(scope.row)">使用</el-button>
+            <el-button type="text" @click="handlesYHSelect(scope.row)">使用</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination background layout="prev, pager, next,total" :total="tableDataQy.total"
-        @current-change="handleCurrentChange"></el-pagination>
+      <el-pagination background layout="prev, pager, next,total" :total="tableDataYh.total"
+        @current-change="handleYHCurrentChange"></el-pagination>
     </div>
 
   </dialogBox>
 </template>
 <script>
   import { mapGetters } from "vuex";
+  import store from '@/store/index.js'
   import { getIdCardInfo } from '@/utils/operation.js'
+  import { queryQyByPage, queryYhByPage } from "@/api/xxba.js";
   import { dataYh, dataQy, sendThis } from "../../javascript/addQlrData";
   export default {
     props: {
@@ -398,28 +386,32 @@
           zjzl: [{ required: true, message: "证件种类", trigger: "change" }],
           zjh: [{ required: true, message: "证件号", trigger: "blur" }],
         },
-        tableDataYh: {
-          total: 0,
-          columns: dataYh.columns(),
-          data: [
-            {
-              sqrmc: '李怡然',
-              zjh: '99999999999',
-              frmc: '李怡然同学',
-              txdz: '山东日照',
-              dh: '18802933269'
-            }
-          ],
+
+        pageData: {
+          currentPage: 1,
+          pageSize: 8
         },
-        queryForm: {
-          zjh: "",
-          sqrmc: ""
+        // 企业
+        queryFormQY: {
+          qymc: "",
+          zjh: ""
         },
         tableDataQy: {
           total: 0,
           columns: dataQy.columns(),
           data: [],
         },
+        // 银行
+        queryFormYH: {
+          qymc: "",
+          zjh: ""
+        },
+        tableDataYh: {
+          total: 0,
+          columns: dataYh.columns(),
+          data: [
+          ],
+        },
       }
     },
     mounted () {
@@ -450,28 +442,75 @@
         } else {
           this.isShow = true
         }
+        this.pageData.currentPage = 1
+        if (this.activeName == 2) {
+          this.handleSearchQY()
+        } else {
+          this.handleSearchYH()
+        }
       },
       /**
-       * @description: 身份证打卡器
-       * @param {*} row
+       * @description:企业查询
        * @author: renchao
        */
-      handlesYhSelect (row) {
-        this.$emit("updateDetail", _.cloneDeep(row));
+      dicStatus (val, code) {
+        let data = store.getters.dictData[code],
+          name = '暂无'
+        if (data) {
+          data.map((item) => {
+            if (item.dcode == val) {
+              name = item.dname
+            }
+          })
+          return name
+        }
+      },
+      handleSearchQY () {
+        let data = { ...this.queryFormQY, ...this.pageData }
+        this.tableDataQy.data = []
+        queryQyByPage(data).then((res) => {
+          if (res.code === 200) {
+            let { total, records } = res.result;
+            this.tableDataQy.total = total;
+            this.tableDataQy.data = records;
+            this.tableDataQy.data.forEach(item => {
+              item.zjzlMc = this.dicStatus(item.zjzl, 'A30')
+              item.sqrmc = item.qymc
+            })
+          }
+        })
+      },
+      handleQYCurrentChange (val) {
+        this.pageData.currentPage = val
+        this.handleSearchQY()
+      },
+      handlesQYSelect (val) {
+        this.$emit("updateDetail", _.cloneDeep(val));
         this.$emit("input", false);
       },
-      /**
-       * @description: handleSearch
-       * @author: renchao
-       */
-      handleSearch () { },
-      /**
-       * @description: handleCurrentChange
-       * @param {*} val
-       * @author: renchao
-       */
-      handleCurrentChange (val) {
-        console.log(val);
+      // 银行
+      handleSearchYH () {
+        let data = { ...this.queryFormYH, ...this.pageData }
+        this.tableDataYh.data = []
+        queryYhByPage(data).then((res) => {
+          if (res.code === 200) {
+            let { total, records } = res.result;
+            this.tableDataYh.total = total;
+            this.tableDataYh.data = records;
+            this.tableDataYh.data.forEach(item => {
+              item.zjzlMc = this.dicStatus(item.zjzl, 'A30')
+              item.sqrmc = item.qymc
+            })
+          }
+        })
+      },
+      handleYHCurrentChange (val) {
+        this.pageData.currentPage = val
+        this.handleSearchQY()
+      },
+      handlesYHSelect (val) {
+        this.$emit("updateDetail", _.cloneDeep(val));
+        this.$emit("input", false);
       },
       /**
        * @description: 身份证打卡器

@@ -195,6 +195,10 @@
       }
     },
     methods: {
+      /**
+       * @description: handleSubmit
+       * @author: renchao
+       */
       handleSubmit () {
         this.loading = true
         updateClml(this.tableData).then(res => {

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-01 10:53:12
+ * @LastEditTime: 2023-09-11 15:32:32
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -19,7 +19,10 @@ class data1 extends filter {
         prop: "sqrmc",
         label: "姓名/名称",
       },
-
+      {
+        prop: "zjzlMc",
+        label: "证件种类"
+      },
       {
         prop: "zjh",
         label: "证件号",
@@ -29,7 +32,7 @@ class data1 extends filter {
         label: "法人名称",
       },
       {
-        prop: "txdz",
+        prop: "dwdz",
         label: "地址",
       },
       {
@@ -43,8 +46,8 @@ class data1 extends filter {
 class data2 extends filter {
   constructor() {
     super()
-  }
 
+  }
   columns () {
     return [
       {
@@ -52,6 +55,10 @@ class data2 extends filter {
         label: "姓名/名称",
       },
       {
+        prop: "zjzlMc",
+        label: "证件种类",
+      },
+      {
         prop: "zjh",
         label: "证件号",
       },
@@ -60,7 +67,7 @@ class data2 extends filter {
         label: "法人名称",
       },
       {
-        prop: "txdz",
+        prop: "dwdz",
         label: "地址",
       },
       {

@@ -20,7 +20,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="证件种类" prop="zjzl">
+            <el-form-item label="证件种类:" prop="zjzl">
               <el-select
                 clearable
                 v-model="ruleForm.zjzl"
@@ -37,7 +37,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="证件号:" prop="zjh">
-              <el-input v-model="ruleForm.zjh"></el-input>
+              <el-input v-model="ruleForm.zjh" maxlength="18"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -50,13 +50,13 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="法人电话:" prop="frdh">
-              <el-input v-model="ruleForm.frdh"></el-input>
+              <el-input v-model="ruleForm.frdh" maxlength="11"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位地址:">
+            <el-form-item label="单位地址:" prop="dwdz">
               <el-input v-model="ruleForm.dwdz"></el-input>
             </el-form-item>
           </el-col>
@@ -77,8 +77,29 @@
 </template>
 
 <script>
+  const checkPhone = (rule, value, callback) => {
+    let regPone = null
+    let mobile = /^(1[3456789]\d{9})$/  //手机号
+    let tel = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/ // 座机
+    if (value && value[0] === '0') {// 检查 value 是否存在并且不是 null 或者 undefined
+      regPone = tel
+    } else if (value && value[0] !== '0') {
+      regPone = mobile
+    }
+    if (regPone === null) {
+      return callback(
+        new Error('请输入电话')
+      )
+    } else if (!regPone.test(value)) {
+      return callback(
+        new Error("请输入正确的电话格式,其中座机格式'区号-座机号码'")
+      )
+    } else {
+      callback()
+    }
+  };
   import store from '@/store/index.js'
-  import { addQy } from "@/api/xxba.js"
+  import { addQy, update } from "@/api/xxba.js"
   import clxx from './clxx/index.vue'
   export default {
     props: {
@@ -100,7 +121,6 @@
         ruleForm: {
           batchno: '',
           djjg: '',
-          operator: '超级管理员',
           operationtime: '',
           bz: '',
           zsstarno: '',
@@ -127,32 +147,41 @@
             zslx: 2
           }
         ],
-        //证书入库业务号参数
-        ywhQueryForm: {
-          serialtype: 'zsrkbh',
-          serialname: '证书入库编号',
-          serialcode: 'zsrk',
-          digit: '5'
-        },
         rules: {
-          batchNo: [
-            { required: true, message: '入库编号不能为空', trigger: 'blur' }
+          qymc: [
+            { required: true, message: '企业名称不能为空', trigger: 'blur' }
           ],
-          djjg: [
-            { required: true, message: '请选择登记机构', trigger: 'change' }
+          dh: [
+            { required: true, validator: checkPhone, trigger: ["blur"] },
           ],
-          rksj: [
-            { required: true, message: '请选择入库时间', trigger: 'change' }
+          zjzl: [
+            { required: true, message: '请选择证件种类', trigger: 'change' }
           ],
-        },
+          zjh: [
+            { required: true, message: '请输入证件号', trigger: 'blur' }
+          ],
+          frmc: [
+            { required: true, message: '请输入法人名称', trigger: 'blur' }
+          ],
+          frdh: [
+            { required: true, validator: checkPhone, trigger: ["blur"] },
+          ],
+          dwdz: [
+            { required: true, message: '请输入单位地址', trigger: 'blur' }
+          ]
+        }
       }
     },
     mounted () {
       if (this.formData.bsmBatch) {
         this.tableForm[0].bs = null;
         this.tableForm[1].bs = null;
-        this.getDetailInfo(this.formData.bsmBatch);
-      } else { }
+        this.getDetailInfo(this.formData.bsmBatch)
+      }
+      let list = Object.keys(this.formData).length
+      if (list > 0) {
+        this.ruleForm = this.formData
+      }
     },
     methods: {
       handleClick () { },
@@ -161,12 +190,15 @@
        * @author: renchao
        */
       submitForm () {
+        let that = this
         this.tableForm.forEach((item, index) => {
           if (item.bs < 0) {
             return;
           }
         })
-        addQy(this.ruleForm).then(res => {
+        if (this.formData.isAdd != 1) {
+          store.dispatch('user/reWorkFresh', false)
+          update(this.ruleForm).then(res => {
             if (res.code == 200) {
               this.$message.success('保存成功')
               this.$emit("input", false);
@@ -179,6 +211,29 @@
               this.$message.error(res.message);
             }
           })
+        } else {
+          that.$refs['ruleForm'].validate((valid) => {
+            if (valid) {
+              store.dispatch('user/reWorkFresh', false)
+              addQy(this.ruleForm).then(res => {
+                if (res.code == 200) {
+                  that.$message.success('保存成功')
+                  that.$emit("input", false);
+                  that.$refs['ruleForm'].resetFields();
+                  that.resetTableFields();
+                  that.closeDialog();
+                  //刷新列表
+                  store.dispatch('user/reWorkFresh', true)
+                } else {
+                  that.$message.error(res.message);
+                }
+              })
+            } else {
+              this.$message.error('请完善表单');
+              return false;
+            }
+          })
+        }
       },
       /**
        * @description: 获取详情信息

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-07 16:13:07
+ * @LastEditTime: 2023-09-11 13:35:33
 -->
 <template>
   <div class="clmlmx-box">
     <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
     </lb-table>
     <div class="text-center">
-      <el-button @click="$popupCacel">取消</el-button>
+      <el-button @click="handleCancel">取消</el-button>
       <el-button type="primary" @click="handleSubmit" :loading="loading" v-if="formData.ableOperation && tableData.length>0">保存</el-button>
     </div>
   </div>
@@ -16,6 +16,7 @@
 <script>
   import Vue from 'vue'
   import store from '@/store/index.js'
+  import { ywPopupCacel } from "@/utils/popup.js";
   import { InitClml, updateClml, deleteSjClml, moveClml } from "@/api/clxx.js";
   export default {
     props: {
@@ -123,10 +124,10 @@
             label: "扫描页数",
             width: "80",
             render: (h, scope) => {
-              if (scope.row.children && scope.row.children.length > 0) {
+              if (scope.row.count && scope.row.count > 0) {
                 return (
                   <div>
-                    <span>{scope.row.children.length}</span>
+                    <span>{scope.row.count}</span>
                   </div>
                 );
               } else {
@@ -184,6 +185,9 @@
       }
     },
     methods: {
+      handleCancel () {
+        ywPopupCacel()
+      },
       handleSubmit () {
         this.loading = true
         updateClml(this.tableData).then(res => {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-08 14:49:24
+ * @LastEditTime: 2023-09-11 14:01:06
 -->
 <template>
   <div class="rlPopup">
@@ -14,7 +14,7 @@
     <div class="img-list-wrap">
       <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪">
       <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
-        <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
+        <photo-zoom :url="img.fileurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
           overlayStyle="width: 100%;height:100%">
         </photo-zoom>
       </div>
@@ -53,7 +53,7 @@
 <script>
   import PhotoZoom from '@/components/PhotoZoom'
   import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
-  import { uploadBatch, deleteClmx } from "@/api/company.js"
+  import { uploadBatch, deleteFile } from "@/api/company.js"
   import publicPicture from '@/components/publicPicture/index.vue'
   export default {
     name: 'PreviewImage',
@@ -93,11 +93,8 @@
       previewImg: {
         handler (newValue, oldValue) {
           if (newValue.imgList && newValue.imgList.length > 0) {
-            this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fjurl)
+            this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fileurl)
             this.thumbnailImages = newValue.imgList
-            this.thumbnailImages.forEach(item => {
-              item.fjurl = item.fileurl
-            })
           } else {
             this.allLi = []
             this.thumbnailImages = []
@@ -111,9 +108,6 @@
       this.maxLength = 0;
       this.allLi = _.cloneDeep(this.previewImg.imgList).map(item => item.fjurl)
       this.thumbnailImages = this.previewImg.imgList
-      this.thumbnailImages.forEach(item => {
-        item.fjurl = item.fileurl
-      })
     },
     computed: {
       isFirst () {
@@ -275,9 +269,12 @@
             return;
           }
           formData.append("bsmMaterial", this.previewImg.bsmMaterial);
+          if (this.previewImg.imgList.length > 0) {
+            formData.append("index", this.previewImg.index + 1);
+          }
           uploadBatch(formData).then((res) => {
             if (res.code == 200) {
-              this.$emit('updateList', res.result)
+              this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
               this.$message({
                 message: '上传成功!',
                 type: 'success'
@@ -299,10 +296,10 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(async () => {
-          let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
+          let bsmFile = this.previewImg.imgList[this.previewImg.index].bsmFile
           let bsmMaterial = this.previewImg.imgList[this.previewImg.index].bsmMaterial
-          this.previewImg.imgList = this.previewImg.imgList.filter(item => item.bsmClmx != bsmClmx)
-          deleteClmx(bsmClmx).then(res => {
+          this.previewImg.imgList = this.previewImg.imgList.filter(item => item.bsmFile != bsmFile)
+          deleteFile(bsmFile).then(res => {
             if (res.code == 200) {
               that.$emit('updateList', { children: this.previewImg.imgList, bsmMaterial: bsmMaterial })
               that.$message({

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-08 15:02:18
+ * @LastEditTime: 2023-09-11 13:52:42
 -->
 <template>
   <div class="clxx">
@@ -33,7 +33,8 @@
                 :class="['child', treeCheckId == item.bsmMaterial ? 'checked' : '']"
                 @click="treeClick(item, index)">
                 {{ item.clmc }}
-                <span class="cl_number" :key="key">({{ item.sxh }})</span>
+                <span class="cl_number" :key="key" v-if="item.count">({{ item.count }})</span>
+                <span class="cl_number" :key="key" v-else>(0)</span>
               </div>
             </div>
           </div>
@@ -57,6 +58,7 @@
 </template>
 <script>
   import store from '@/store/index.js'
+  import { ywPopupDialog, ywPopupCacel } from "@/utils/popup.js";
   import clxxAddDialog from "./dialog/clxxAddDialog.vue";
   import clxxDetailDialog from "./dialog/clxxDetailDialog.vue";
   import imagePreview from "./dialog/imagePreview.vue";
@@ -84,9 +86,9 @@
           bsmMaterial: "",
           index: 0,
           selectedIndex: 0,
-          imgList: [],
-        },
-      };
+          imgList: []
+        }
+      }
     },
     created () {
       this.clmlInitList();
@@ -181,7 +183,7 @@
         this.title = item.sjmc;
         this.titleYs = 1;
         this.titleNum = item.children.length;
-        // this.previewImg.imgList = item.children;
+        this.previewImg.imgList = item.children;
         this.previewImg.bsmMaterial = item.bsmMaterial;
       },
       /**
@@ -191,14 +193,14 @@
        */
       updateList (val) {
         let that = this;
-        if (val.length != 0) {
+        if (val.children.length != 0) {
           //删除最后一张图片时 val=null
           this.tableData.forEach((item) => {
-            if (item.bsmMaterial === val.bsmMaterial) {
-              item.ys = val.length
+            if (item.bsmMaterial == val.bsmMaterial) {
+              item.count = val.children.length
             }
           });
-          this.previewImg.imgList = _.cloneDeep(val);
+          this.previewImg.imgList = _.cloneDeep(val.children);
           if (this.previewImg.index == this.previewImg.imgList.length) {
             this.previewImg.index = this.previewImg.index - 1;
           }
@@ -207,7 +209,7 @@
           this.previewImg.imgList = [];
           this.tableData.forEach((item, index) => {
             if (this.treeCheckId == item.bsmMaterial) {
-              item.ys = 0;
+              item.count = 0;
               that.treeCheckIndex = index;
             }
           })
@@ -270,15 +272,9 @@
       //查看明细
       viewDetail () {
         store.dispatch("user/reWorkFresh", false);
-        this.$popupDialog(
-          "申请材料目录",
-          "workflow/components/dialog/clxxDetailDialog",
-          {
+        ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
           data: this.tableData,
-          },
-          "60%",
-          true
-        );
+        }, "60%", true, false)
       },
       //设置tableData
       setTableData (tableData) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-08 09:30:08
+ * @LastEditTime: 2023-09-11 11:23:49
 -->
 <template>
   <div class="from-clues">

@@ -330,6 +330,10 @@
       };
     },
     methods: {
+      /**
+       * @description: updateFdcwxmList
+       * @author: renchao
+       */
       updateFdcwxmList (val) {
         this.ruleForm.fdcqxm && (this.ruleForm.fdcqxm = _.cloneDeep(val));
         this.key++;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-11 09:54:24
+ * @LastEditTime: 2023-09-11 09:55:52
 -->
 <template>
   <div class="from-clues">
@@ -134,9 +134,15 @@
         </el-table-column>
 
         <el-table-column
-          property="fwjgmc"
+          width="100"
           label="房屋结构">
+          <template slot-scope="scope">
+            <el-tooltip effect="dark" :content="scope.row.fwjgmc" placement="top" popper-class="tooltip-width">
+              <span class="ellipsis-table"> {{scope.row.fwjgmc}}</span>
+            </el-tooltip>
+          </template>
         </el-table-column>
+
         <el-table-column
           property="jzmj"
           label="房屋面积(㎡)">