Kaynağa Gözat

Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

cfort 2 yıl önce
ebeveyn
işleme
c13e7bcb56

+ 2 - 2
src/business/platform/form/formrender/dynamic-form/mixins/StatisOrRecordTable.vue

@@ -2,7 +2,7 @@
 <template>
     <div>
         <ul style="padding: 0px;margin: 0px;">
-            <li v-for="(el, index) in staOrRec" :key="index" class="tableClazz" @click="openDataTemplate(el)">
+            <li v-for="(el, index) in StaOrRec" :key="index" class="tableClazz" @click="openDataTemplate(el)">
                 <!-- 统计页面呈现-->
                 <el-tag>
                     {{ el.title }}
@@ -31,7 +31,7 @@ export default {
         templateStatis: templateStatis
     },
     props: {
-        staOrRec: { // 传入的开启对话框数组
+        StaOrRec: { // 传入的开启对话框数组
             type: Array
         },
         form: { // 当前表单示例

+ 2 - 1
src/views/infosManage/fileIE.vue

@@ -222,7 +222,8 @@ export default {
         }
       }
       // 重复发放的文件,在权限表会存在重复的文件信息
-      let fileSearchSql = `select  wj.wen_jian_xi_lei_,wj.wen_jian_bian_hao,wj.wen_jian_ming_che,wj.ban_ben_,wj.wen_jian_fu_jian_ AS fu_jian_,qx.fa_bu_ri_qi_ ,MAX(qx.create_time_) AS create_time_ FROM t_wjcysqb qx LEFT JOIN t_wjxxb wj ON qx.wen_jian_id_=wj.wen_jian_fu_jian_ WHERE qx.yong_hu_id_='${this.userId}' AND qx.shou_quan_='1' ${wheres} GROUP BY qx.yong_hu_id_,qx.wen_jian_id_`
+      let fileSearchSql = `select  wj.wen_jian_xi_lei_,wj.wen_jian_bian_hao,wj.wen_jian_ming_che,wj.ban_ben_,wj.wen_jian_fu_jian_ AS fu_jian_,qx.fa_bu_ri_qi_ 
+       FROM (SELECT *FROM (SELECT * FROM t_wjcysqb  ORDER BY create_time_ DESC LIMIT 99999999) a GROUP BY a.yong_hu_id_,a.wen_jian_id_) qx LEFT JOIN t_wjxxb wj ON qx.wen_jian_id_=wj.wen_jian_fu_jian_ WHERE qx.yong_hu_id_='${this.userId}' AND qx.shou_quan_='1' ${wheres} GROUP BY qx.yong_hu_id_,qx.wen_jian_id_`
       let oldRecordSql = `select * FROM t_ywyxjlb wj  LEFT JOIN lh_bm_ry ry ON ry.ry_id = wj.bian_zhi_ren_ where wj.bian_zhi_ren_='${this.userId}' ${wheres}  order by bian_zhi_shi_jian desc`
       let sql = this.pageKey === 'nbwj' ? fileSearchSql : oldRecordSql
 

+ 150 - 143
src/views/permissions/details/fileEchart.vue

@@ -1,164 +1,171 @@
 <template>
-    <div>
-        <div style="text-align: center">
-            <!--表头-->
-            <div class="form-header">
-                <div class="title ibps-tc">用户查阅文件授权</div>
-            </div>
-            <el-transfer
-                v-model="permissionFilesKey"
-                style="text-align: left; display: inline-block"
-                filterable
-                :filter-method="filterMethod"
-                :render-content="renderFunc"
-                :titles="['受限文件', '可查阅文件']"
-                :button-texts="['受限', '可查阅']"
-                :format="{
+  <div>
+    <div style="text-align: center">
+      <!--表头-->
+      <div class="form-header">
+        <div class="title ibps-tc">用户查阅文件授权</div>
+      </div>
+      <el-transfer style="text-align: left; display: inline-block"
+                   v-model="permissionFilesKey"
+                   filterable
+                   :filter-method="filterMethod"
+                   :render-content="renderFunc"
+                   :titles="['受限文件', '可查阅文件']"
+                   :button-texts="['受限', '可查阅']"
+                   :format="{
                     noChecked: '${total}',
                     hasChecked: '${checked}/${total}'
                 }"
-                :data="allFiles"
-                @change="handleChange"
-            />
-        </div>
+                   @change="handleChange"
+                   :data="allFiles">
+      </el-transfer>
     </div>
+  </div>
 </template>
 
+
+
+
 <script>
+import { getLmitedFile, getUserByFile, saveUserByFile } from '@/api/permission/file'
 import curdPost from '@/business/platform/form/utils/custom/joinCURD.js'
+
 export default {
-    props: {
-        id: {
-            type: [String, Number]
-        }
+  props: {
+    id: {
+      type: [String, Number]
     },
-    data () {
-        return {
-            idT: '',
-            allFilesDatas: [], // 所有受控文件,与个人无关
-            allFiles: [],
-            allFilesIds: [],
-            hadper: [], // 基于权限的文件id
-            noper: [], // 取消文件的id
-            noPermissionFiles: [],
-            permissionFiles: [],
-            permissionFilesKey: [],
-            renderFunc (h, option) {
-                return <span>{option.type}-{option.label}</span>
+  },
+  data() {
+    return {
+      idT: '',
+      allFilesDatas: [],// 所有受控文件,与个人无关
+      allFiles: [],
+      allFilesIds: [],
+      hadper: [], // 基于权限的文件id
+      noper: [], // 取消文件的id
+      noPermissionFiles: [],
+      permissionFiles: [],
+      permissionFilesKey: [],
+      renderFunc(h, option) {
+        return <span>{option.type}-{option.label}</span>;
+      },
+      filterMethod(query, item) {
+        let name = item.label + '-' + item.type
+        return name.includes(query);
+      }
+    };
+  },
+
+  methods: {
+    handleChange(value, direction, movedKeys) {
+      // 批量修改,多条数据,根据条件修改指定的值
+      let dataWheres = []
+      if (value.length !== 0) {
+        for (let i of value) {
+          // 受限文件
+          let dataWhere = {}
+          let where1 = {}
+          let param1 = {}
+          where1["yong_hu_id_"] = this.id
+          where1["wen_jian_id_"] = i
+          param1["shou_quan_"] = '1'
+          dataWhere["where"] = where1
+          dataWhere["param"] = param1
+          dataWheres.push(dataWhere)
+        }
+        for (let i of this.getArrDif(this.allFilesIds, value)) {
+          // 非受限
+          let dataWhere = {}
+          let where1 = {}
+          let param1 = {}
+          where1["yong_hu_id_"] = this.id
+          where1["wen_jian_id_"] = i
+          param1["shou_quan_"] = '0'
+          dataWhere["where"] = where1
+          dataWhere["param"] = param1
+          dataWheres.push(dataWhere)
+        }
+
+        let param = { tableName: "t_wjcysqb", updList: dataWheres }
+        curdPost('update', param)
+      } else {
+        const param = {
+          tableName: 't_wjcysqb',
+          updList: [{
+            where: {
+              yong_hu_id_: this.id
             },
-            filterMethod (query, item) {
-                const name = item.label + '-' + item.type
-                return name.includes(query)
+            param: {
+              shou_quan_: '0'
             }
+          }]
         }
+        curdPost('update', param)
+      }
     },
-    watch: {
-        id: {
-            immediate: true,
-            handler: function (val, oldVal) {
-                this.allFilesDatas = []
-                this.permissionFiles = []
-                this.noPermissionFiles = []
-                this.allFiles = []
-                this.permissionFilesKey = []
-                this.idT = val
-                this.getFormData(val)
-            }
-        }
+    getArrDif(arr1, arr2) {
+      return arr1.concat(arr2).filter((v, i, arr) => {
+        return arr.indexOf(v) === arr.lastIndexOf(v)
+      })
     },
-
-    methods: {
-        handleChange (value, direction, movedKeys) {
-            // 批量修改,多条数据,根据条件修改指定的值
-            const dataWheres = []
-            if (value.length !== 0) {
-                for (const i of value) {
-                    // 受限文件
-                    const dataWhere = {}
-                    const where1 = {}
-                    const param1 = {}
-                    // where1['yong_hu_id_'] = this.id
-                    where1['id_'] = i
-                    param1['shou_quan_'] = '1'
-                    dataWhere['where'] = where1
-                    dataWhere['param'] = param1
-                    dataWheres.push(dataWhere)
-                }
-                for (const i of this.getArrDif(this.allFilesIds, value)) {
-                    // 非受限
-                    const dataWhere = {}
-                    const where1 = {}
-                    const param1 = {}
-                    // where1['yong_hu_id_'] = this.id
-                    where1['id_'] = i
-                    param1['shou_quan_'] = '0'
-                    dataWhere['where'] = where1
-                    dataWhere['param'] = param1
-                    dataWheres.push(dataWhere)
-                }
-                const param = { tableName: 't_wjcysqb', updList: dataWheres }
-                curdPost('update', param)
-            } else {
-                const param = {
-                    tableName: 't_wjcysqb',
-                    updList: [
-                        {
-                            where: {
-                                yong_hu_id_: this.id
-                            },
-                            param: {
-                                shou_quan_: '0'
-                            }
-                        }
-                    ]
-                }
-                curdPost('update', param)
-            }
-        },
-        getArrDif (arr1, arr2) {
-            return arr1.concat(arr2).filter((v, i, arr) => {
-                return arr.indexOf(v) === arr.lastIndexOf(v)
-            })
-        },
-        // 重复发放的文件,在权限表会存在重复的文件信息
-        getFormData (id) {
-            const sql = `select qx.id_ as id , wj.wen_jian_fu_jian_ AS wenJianId, wj.wen_jian_ming_che AS wenJianMingChe,   
-   wj.wen_jian_xi_lei_ AS neiLeiXing ,      qx.shou_quan_ AS shouQuan     FROM (
-           SELECT a.id_,a.create_by_,MAX(a.create_time_) create_time_ ,a.yong_hu_id_,a.wen_jian_id_,
-                   a.fa_bu_ri_qi_,a.shou_quan_ FROM t_wjcysqb a  GROUP BY yong_hu_id_,wen_jian_id_      
-                   ) qx LEFT JOIN t_wjxxb wj ON qx.wen_jian_id_=wj.wen_jian_fu_jian_ WHERE qx.yong_hu_id_='${id}' ORDER BY wj.xi_lei_id_ DESC
-`
-            curdPost('sql', sql).then(res => {
-                for (const i of res.variables.data) {
-                    this.allFilesDatas.push(i)
-                    this.allFilesIds.push(i.id)
-                    if (i.shouQuan == '1') {
-                        // 已授权文件
-                        const filterFile = {}
-                        filterFile['key'] = i.id
-                        filterFile['label'] = i.wenJianMingChe
-                        filterFile['type'] = i.neiLeiXing
-                        filterFile['yongHuId'] = i.yong_hu_id_
-                        this.permissionFiles.push(filterFile)
-                        this.permissionFilesKey.push(i.id)
-                        this.allFiles.push(filterFile)
-                    } else {
-                        // 未授权文件,但是已经发放
-                        const fileData = {}
-                        fileData['key'] = i.id
-                        fileData['label'] = i.wenJianMingChe
-                        fileData['type'] = i.neiLeiXing ? i.neiLeiXing : i.waiLeiXing
-                        fileData['yongHuId'] = id
-                        this.noPermissionFiles.push(fileData)
-                        this.allFiles.push(fileData)
-                    }
-                }
-            }).catch(res => {
-            })
+    // 重复发放的文件,在权限表会存在重复的文件信息
+    getFormData(id) {
+      let sql = `select  wj.wen_jian_fu_jian_ AS wenJianFuJian,
+      wj.wen_jian_ming_che AS wenJianMingCheng,
+      wj.wen_jian_xi_lei_ AS wenJianXiLei ,
+      qx.shou_quan_ AS shouQuan,
+      qx.id_
+      FROM (
+         SELECT *FROM (SELECT * FROM t_wjcysqb  ORDER BY create_time_ DESC LIMIT 99999999) a GROUP BY a.yong_hu_id_,a.wen_jian_id_
+      ) qx LEFT JOIN t_wjxxb wj ON qx.wen_jian_id_=wj.wen_jian_fu_jian_ where qx.yong_hu_id_='${id}' order by wj.wen_jian_xi_lei_ ASC`
+      curdPost('sql', sql).then(res => {
+        for (let i of res.variables.data) {
+          this.allFilesDatas.push(i)
+          this.allFilesIds.push(i.wenJianFuJian)
+          if (i.shouQuan == '1') {
+            // 已授权文件
+            let filterFile = {}
+            filterFile["key"] = i.wenJianFuJian
+            filterFile["label"] = i.wenJianMingCheng
+            filterFile["type"] = i.wenJianXiLei
+            filterFile["yongHuId"] = id
+            this.permissionFiles.push(filterFile)
+            this.permissionFilesKey.push(i.wenJianFuJian)
+            this.allFiles.push(filterFile)
+          } else {
+            // 未授权文件,但是已经发放
+            let fileData = {}
+            fileData["key"] = i.wenJianFuJian
+            fileData["label"] = i.wenJianMingCheng
+            fileData["type"] = i.wenJianXiLei
+            fileData["yongHuId"] = id
+            this.noPermissionFiles.push(fileData)
+            this.allFiles.push(fileData)
+          }
         }
+      }).catch(res => {
+      })
+
+    },
+  },
+  watch: {
+    id: {
+      immediate: true,
+      handler: function (val, oldVal) {
+        this.allFilesDatas = []
+        this.permissionFiles = []
+        this.noPermissionFiles = []
+        this.allFiles = []
+        this.permissionFilesKey = []
+        this.idT = val
+        this.getFormData(val)
+      },
     }
-}
+  }
+};
 </script>
+  
 
 <style  scoped lang="less">
 .form-header {
@@ -213,4 +220,4 @@ export default {
 /deep/ .el-button {
   width: 100%;
 }
-</style>
+</style>

+ 17 - 7
src/views/permissions/file_permission/filePermission.vue

@@ -3,16 +3,27 @@
     <div slot="west">
       <div class="box">
         <p class="title">用户信息</p>
-        <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+        <el-input placeholder="输入关键字进行过滤"
+                  v-model="filterText">
         </el-input>
         <div class="treeDiv">
-          <el-tree ref="tree" :data="peopleData" :props="defaultProps" @node-click="handleNodeClick"
-            :filter-node-method="filterNode"></el-tree>
+          <el-tree ref="tree"
+                   :data="peopleData"
+                   :props="defaultProps"
+                   @node-click="handleNodeClick"
+                   :filter-node-method="filterNode"></el-tree>
         </div>
       </div>
-      <ibps-container :margin-left="205 + 'px'" class="page">
-        <detail v-if="show === 'detail'" :id="orgId" />
-        <el-alert v-else :closable="false" title="尚未指定一个人员" type="warning" show-icon style="height:50px;" />
+      <ibps-container :margin-left="205 + 'px'"
+                      class="page">
+        <detail v-if="show === 'detail'"
+                :id="orgId" />
+        <el-alert v-else
+                  :closable="false"
+                  title="尚未指定一个人员"
+                  type="warning"
+                  show-icon
+                  style="height:50px;" />
       </ibps-container>
 
     </div>
@@ -82,6 +93,5 @@ export default {
 }
 </script>
 <style lang="scss" >
-
 </style>
   

+ 2 - 2
src/views/platform/message/inner/detail/index.vue

@@ -74,7 +74,7 @@
                     />
                 </el-form-item>
             </el-col>
-            <el-col v-if="!inside" :span="24">
+            <!-- <el-col v-if="!inside" :span="24">
                 <el-form-item class="list">
                     <el-tabs v-model="activeName" class="detail" @tab-click="handleClick">
                         <el-tab-pane label="已回复信息列表" name="replied" style="height:300px;">
@@ -85,7 +85,7 @@
                         </el-tab-pane>
                     </el-tabs>
                 </el-form-item>
-            </el-col>
+            </el-col> -->
         </el-row>
     </el-form>
 </template>

+ 31 - 29
src/views/system/jbdScan/goods/neishenzhuangtai.vue

@@ -292,29 +292,28 @@ export default {
       }
     },
     partFilter: function (value, arr) {
-      return value
-      // if(value.includes(",")){
-      //   let part = "";
-      //   let parts = []
-      //   parts = value.split(',');
-      //   for(let item of arr){
-      //     for(let j = 0; j < parts.length; j++) {
-      //       if(item.ID_ == parts[j]){
-      //         part = part +","+ item.NAME_;
-      //       }
-      //     }
-      //   }
-      //   return part.slice(1,part.length)
-      // }else{  
-      // for (let i = 0; i < arr.length; i++) {
-      //   console.log(arr[i])
-      //   if (arr[i].ID_ == value) {
-      //     return arr[i].NAME_;
-      //   }else{
-      //     return value
-      //   }
-      // }
-      // }
+      // console.log(value, arr,"12")
+      // return value
+      if(value.includes(",")){
+        let part = "";
+        let parts = []
+        parts = value.split(',');
+        for(let item of arr){
+          for(let j = 0; j < parts.length; j++) {
+            if(item.bu_men_id_ == parts[j]){
+              part = part +","+ item.mian_bu_men;
+            }
+          }
+        }
+        return part.slice(1,part.length)
+      }else{  
+      for (let i = 0; i < arr.length; i++) {
+        console.log(arr[i])
+        if (arr[i].bu_men_id_ == value) {
+          return arr[i].mian_bu_men;
+        }
+      }
+      }
     },
   },
   watch: {
@@ -606,13 +605,16 @@ export default {
       let sql = "select ID_,NAME_,CREATE_TIME_ FROM ibps_party_employee ";
       await curdPost("sql", sql).then((res) => {
         this_.employeeList = res.variables.data;
+        console.log(this_.employeeList,12)
       });
     },
     async getPart() {
+      
       let this_ = this;
-      let sql = "select ID_,NAME_,CREATE_TIME_ FROM ibps_party_org";
+      let sql = "select * FROM ibps_main_position";
       await curdPost("sql", sql).then((res) => {
         this_.partList = res.variables.data;
+        console.log(this_.partList,23)
       });
     },
     jieduan(value) {
@@ -681,17 +683,17 @@ export default {
       let newarr = [];
       let obj = {};
       let str =""
-      let sql = "select ID_,NAME_ FROM  ibps_party_org";
+      let sql = "select * FROM  ibps_main_position";
       await curdPost("sql", sql).then((res) => {
         let arr1 = res.variables.data;
         arr.forEach((item, index) => {
           str =""
           arr1.forEach((it) => {
-            if (item.ze_ren_shi_ == it.ID_ && !item.ze_ren_shi_.includes(",")) {
-              arr[index].ze_ren_shi_ = it.NAME_;
+            if (item.ze_ren_shi_ == it.bu_men_id_ && !item.ze_ren_shi_.includes(",")) {
+              arr[index].ze_ren_shi_ = it.mian_bu_men;
             }
-            if(item.ze_ren_shi_.includes(",")&& item.ze_ren_shi_.includes(it.ID_)){
-              str += "," + it.NAME_
+            if(item.ze_ren_shi_.includes(",")&& item.ze_ren_shi_.includes(it.bu_men_id_)){
+              str += "," + it.mian_bu_men
             }
           });
           if(str){