apply-clients 3.5.4-2 → 3.5.4-21

package/src/filiale/yangchunboneng/pc/ApplyUpload.vue

@@ -120,256 +120,267 @@
 </template>
 
 <script>
-  import {HttpResetClass} from 'vue-client'
-  import {isEmpty} from "../../../components/Util";
+import {HttpResetClass} from 'vue-client'
+import {isEmpty} from "../../../components/Util";
 
-  export default {
-    title: '附件',
-    props: ['blodid', 'businessid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'isdelete', 'bootstraped', 'issearch'],
-    data() {
-      return {
-        defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建节点')],
-        defname: '',
-        fileInfoData: [], // 数据库存储的文件记录对象数组
-        headers: {
-          'username': this.$login.f.name,
-          'blodid': '',
-          'businessid': '',
-          'fremarks': '',
-          'defname': '',
-          'fusetype': ''
-        }, // 调用rs/file/uploadFile 的参数
-        showUpload: false, // 上传模态框控制
-        showhighmeter: false, // 高拍仪组件控制
-        useType: null,
-        checkes:[]
+export default {
+  title: '附件',
+  props: ['blodid', 'businessid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'isdelete', 'bootstraped', 'issearch'],
+  data() {
+    return {
+      defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建节点')],
+      defname: '',
+      fileInfoData: [], // 数据库存储的文件记录对象数组
+      headers: {
+        'username': this.$login.f.name,
+        'blodid': '',
+        'businessid': '',
+        'fremarks': '',
+        'defname': '',
+        'fusetype': ''
+      }, // 调用rs/file/uploadFile 的参数
+      showUpload: false, // 上传模态框控制
+      showhighmeter: false, // 高拍仪组件控制
+      useType: null,
+      checkes:[]
+    }
+  },
+  ready() {
+    this.headers.blodid = this.blodid
+    this.headers.businessid = this.businessid
+    this.headers.defname = this.defname
+    if (this.blodid || this.businessid) {
+      this.load()
+    }
+  },
+  methods: {
+    delet(index, row) {
+      if(this.defname!==row.defname){
+        this.$showMessage('无法删除非当前环节的附件')
+        return
       }
-    },
-    ready() {
-      this.headers.blodid = this.blodid
-      this.headers.businessid = this.businessid
-      this.headers.defname = this.defname
-      if (this.blodid || this.businessid) {
+      this.$resetdelete('rs/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch("delResid", row.id)
         this.load()
-      }
+      })
     },
-    methods: {
-      delet(index, row) {
-        this.$resetdelete('rs/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-          this.$dispatch("delResid", row.id)
-          this.load()
-        })
-      },
-      async deletefiles(){
-        if (this.checkes.length > 0){
-          let http = new HttpResetClass()
-          for (let i = 0;i<this.checkes.length;i++){
-            await http.load('DELETE',`rs/entity/t_files/${this.checkes[i].id}`,{},{resolveMsg: null, rejectMsg: null})
-          }
-          this.load()
+    async deletefiles(){
+      debugger
+      for (let i = 0;i<this.checkes.length;i++){
+        if(this.this.checkes[i].defname!==this.defname){
+          this.$showMessage(`第${i}个不是当前环节的附件,无法删`)
+          return
         }
-      },
-      isChecked(row) {
-        return this.checkes.findIndex(item => item.id == row.id) != -1
-      },
-      setCheckes(row) {
-        let index=this.checkes.findIndex(item => item.id == row.id)
-        if(index<0){
-          this.checkes.push(row)
-        }else{
-          this.checkes.splice(index,1)
+      }
+      if (this.checkes.length > 0){
+        let http = new HttpResetClass()
+        for (let i = 0;i<this.checkes.length;i++){
+          await http.load('DELETE',`rs/entity/t_files/${this.checkes[i].id}`,{},{resolveMsg: null, rejectMsg: null})
         }
-        console.log('this.checkes=', JSON.stringify(this.checkes))
-      },
-      // 下载
-      downloadfile(filepath) {
-        let name = this.extractFileName(filepath)
-          var link = document.createElement('a')
-          link.href = filepath
-          link.download = name
-          link.dispatchEvent(new MouseEvent('click'))
-      },
-      extractFileName(str) {
-        // 使用split分割字符串
-        var parts = str.split('\\');
-        // 获取最后一个部分，这通常是文件名
-        var fileName = parts[parts.length - 1];
-        // 返回文件名
-        return fileName;
-      },
-      // 关闭文件上传对话框
-      close() {
-        this.showUpload = false
-        this.showhighmeter = false
-        // 将选的文件清空
-        this.$refs.file.$el.querySelector('input').value = ''
-        this.headers.fusetype = ''
-        this.headers.fremarks = ''
         this.load()
-      },
-      // 查询
-      async load() {
-        let condition = ''
-        if (!isEmpty(this.businessid)) {
-          condition = `f_businessid= '${this.headers.businessid}' `
-        } else {
-          condition = `f_blobid= '${this.headers.blodid}' `
-        }
-        if (!isEmpty(this.useType)) {
-          condition += `and fusetype = '${this.useType}'`
-        }
-        if (!isEmpty(this.defname)) {
-          condition += `and defname = '${this.defname}'`
+      }
+    },
+    isChecked(row) {
+      return this.checkes.findIndex(item => item.id == row.id) != -1
+    },
+    setCheckes(row) {
+      let index=this.checkes.findIndex(item => item.id == row.id)
+      if(index<0){
+        this.checkes.push(row)
+      }else{
+        this.checkes.splice(index,1)
+      }
+      console.log('this.checkes=', JSON.stringify(this.checkes))
+    },
+    // 下载
+    downloadfile(filepath) {
+      let name = this.extractFileName(filepath)
+      var link = document.createElement('a')
+      link.href = filepath
+      link.download = name
+      link.dispatchEvent(new MouseEvent('click'))
+    },
+    extractFileName(str) {
+      // 使用split分割字符串
+      var parts = str.split('\\');
+      // 获取最后一个部分，这通常是文件名
+      var fileName = parts[parts.length - 1];
+      // 返回文件名
+      return fileName;
+    },
+    // 关闭文件上传对话框
+    close() {
+      this.showUpload = false
+      this.showhighmeter = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+      this.headers.fusetype = ''
+      this.headers.fremarks = ''
+      this.load()
+    },
+    // 查询
+    async load() {
+      let condition = ''
+      if (!isEmpty(this.businessid)) {
+        condition = `f_businessid= '${this.headers.businessid}' `
+      } else {
+        condition = `f_blobid= '${this.headers.blodid}' `
+      }
+      if (!isEmpty(this.useType)) {
+        condition += `and fusetype = '${this.useType}'`
+      }
+      if (!isEmpty(this.defname)) {
+        condition += `and defname = '${this.defname}'`
+      }
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_files',
+        condition: condition + ` order by f_uploaddate desc `
+      }
+      let getFile = await http.load('POST', 'rs/sql/apply_singleTable', {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+      this.fileInfoData = []
+      for (var i = 0; i < getFile.data.length; i++) {
+        // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+        if (getFile.data[i].fusetype && (getFile.data[i].fusetype.includes('execl导入'))) {
+          getFile.data.splice(i, 1)
+          i--
+          continue
         }
-        let http = new HttpResetClass()
-        let data = {
-          tablename: 't_files',
-          condition: condition + ` order by f_uploaddate desc `
+        let temp = getFile.data[i].f_downloadpath
+        let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+        getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
+        let uploaddate = getFile.data[i].f_uploaddate.substring(0,10)
+        if (this.fileInfoData.findIndex(item => item.uploaddate == uploaddate) == -1){
+          this.fileInfoData.push({uploaddate:uploaddate,data:[]})
         }
-        let getFile = await http.load('POST', 'rs/sql/apply_singleTable', {data: data}, {
-          warnMsg: null,
-          resolveMsg: null
-        })
-        this.fileInfoData = []
-        for (var i = 0; i < getFile.data.length; i++) {
-          // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
-          if (getFile.data[i].fusetype && (getFile.data[i].fusetype.includes('execl导入'))) {
-            getFile.data.splice(i, 1)
-            i--
-            continue
-          }
+      }
+      for (var i = 0; i < getFile.data.length; i++) {
+        if (getFile.data[i].f_downloadpath.includes('http:')) {
+          let temp = getFile.data[i].f_downloadpath
+          getFile.data[i].f_downloadURL = temp
+          console.log('打印', i)
+        } else {
           let temp = getFile.data[i].f_downloadpath
           let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
           getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
-          let uploaddate = getFile.data[i].f_uploaddate.substring(0,10)
-          if (this.fileInfoData.findIndex(item => item.uploaddate == uploaddate) == -1){
-            this.fileInfoData.push({uploaddate:uploaddate,data:[]})
-          }
         }
-        for (var i = 0; i < getFile.data.length; i++) {
-          if (getFile.data[i].f_downloadpath.includes('http:')) {
-            let temp = getFile.data[i].f_downloadpath
-            getFile.data[i].f_downloadURL = temp
-            console.log('打印', i)
-          } else {
-            let temp = getFile.data[i].f_downloadpath
-            let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
-            getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
-          }
 
-        }
-        // this.fileInfoData = getFile.data
-        for (var i = 0; i < getFile.data.length; i++) {
-          for (var j = 0; j < this.fileInfoData.length; j++){
-            if (getFile.data[i].f_uploaddate.includes(this.fileInfoData[j].uploaddate)){
-              this.fileInfoData[j].data.push(getFile.data[i])
-            }
+      }
+      // this.fileInfoData = getFile.data
+      for (var i = 0; i < getFile.data.length; i++) {
+        for (var j = 0; j < this.fileInfoData.length; j++){
+          if (getFile.data[i].f_uploaddate.includes(this.fileInfoData[j].uploaddate)){
+            this.fileInfoData[j].data.push(getFile.data[i])
           }
         }
-      },
-      // 打开高拍仪
-      upload() {
-        if (this.showhighmeter) {
-          this.$refs.ltgao.closeVideo()
-        }
-        this.showhighmeter = !this.showhighmeter
-      },
-      // 高拍仪回调
-      newPhoto(Imgbase64, fusetype, fremarks) {
-        this.headers.fusetype = fusetype
-        this.headers.fremarks = fremarks
-
-        let form = new FormData()
-        let xhr = new XMLHttpRequest()
-        let formDataBoundary = "----WebkitFormBoundary" + "GaoPaiYi";
-        form.append('Content-Type', 'multipart/form-data;boundary=' + formDataBoundary)
-        form.append('file', this.convertBase64ToBlob(Imgbase64), "GaoPaiYi.jpg")
-        xhr.open("POST", "rs/file/uploadFile")
+      }
+    },
+    // 打开高拍仪
+    upload() {
+      if (this.showhighmeter) {
+        this.$refs.ltgao.closeVideo()
+      }
+      this.showhighmeter = !this.showhighmeter
+    },
+    // 高拍仪回调
+    newPhoto(Imgbase64, fusetype, fremarks) {
+      this.headers.fusetype = fusetype
+      this.headers.fremarks = fremarks
 
-        if (this.headers) {
-          for (var header in this.headers) {
-            xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
-          }
-        }
-        xhr.send(form)
-        setTimeout(() => {
-          this.close()
-        }, 5000)
-      },
-      convertBase64ToBlob(base64String) {
-        // 将base64解码
-        var bytes = atob(base64String);
-        //var bytes = base64;
-        var bytesCode = new ArrayBuffer(bytes.length);
-        // 转换为类型化数组
-        var byteArray = new Uint8Array(bytesCode);
+      let form = new FormData()
+      let xhr = new XMLHttpRequest()
+      let formDataBoundary = "----WebkitFormBoundary" + "GaoPaiYi";
+      form.append('Content-Type', 'multipart/form-data;boundary=' + formDataBoundary)
+      form.append('file', this.convertBase64ToBlob(Imgbase64), "GaoPaiYi.jpg")
+      xhr.open("POST", "rs/file/uploadFile")
 
-        // 将base64转换为ascii码
-        for (var i = 0; i < bytes.length; i++) {
-          byteArray[i] = bytes.charCodeAt(i);
+      if (this.headers) {
+        for (var header in this.headers) {
+          xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
         }
-        // 生成Blob对象（文件对象）
-        return new Blob([bytesCode], {type: 'image/jpeg'});
-      },
-    },
-    computed: {
-      typeOfUse() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('报建-使用类型')]
       }
-    },
-    events: {
-      onFileUpload: function (file, res) {
-        this.$dispatch("resid", res.id)
-        this.headers.fremarks = ''
+      xhr.send(form)
+      setTimeout(() => {
         this.close()
+      }, 5000)
+    },
+    convertBase64ToBlob(base64String) {
+      // 将base64解码
+      var bytes = atob(base64String);
+      //var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length);
+      // 转换为类型化数组
+      var byteArray = new Uint8Array(bytesCode);
+
+      // 将base64转换为ascii码
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i);
       }
+      // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], {type: 'image/jpeg'});
+    },
+  },
+  computed: {
+    typeOfUse() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('报建-使用类型')]
+    }
+  },
+  events: {
+    onFileUpload: function (file, res) {
+      this.$dispatch("resid", res.id)
+      this.headers.fremarks = ''
+      this.close()
     }
   }
+}
 </script>
 
 <style scoped>
-  .clears {
-    margin: 0;
-    font-size: 10px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
+.clears {
+  margin: 0;
+  font-size: 10px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 
-  .showData {
-    padding: 15px 10px 0px 10px;
-    box-sizing: border-box;
-    height: 140px;
-    font-family: "微软雅黑";
-  }
+.showData {
+  padding: 15px 10px 0px 10px;
+  box-sizing: border-box;
+  height: 140px;
+  font-family: "微软雅黑";
+}
 
-  .showData .item {
-    padding-bottom: 10px;
-    border-bottom: solid 1px #c1c1c1;
-  }
+.showData .item {
+  padding-bottom: 10px;
+  border-bottom: solid 1px #c1c1c1;
+}
 
-  .left {
-    padding-right: 10px;
-  }
+.left {
+  padding-right: 10px;
+}
 
-  .left img {
-    height: 100%;
-    width: 100%;
-  }
+.left img {
+  height: 100%;
+  width: 100%;
+}
 
-  .right {
-    height: 100%;
-    /*display: -webkit-flex;*/
-    /*display: flex;*/
-    /*flex-direction: column;*/
-    /*justify-content: space-around;*/
-  }
+.right {
+  height: 100%;
+  /*display: -webkit-flex;*/
+  /*display: flex;*/
+  /*flex-direction: column;*/
+  /*justify-content: space-around;*/
+}
 
-  .item_btn {
-    width: 80%;
-    background-color: #6aa6e2;
-    border-radius: 4px;
-    color: #FFFFFF;
-    font-family: PingFang;
-  }
+.item_btn {
+  width: 80%;
+  background-color: #6aa6e2;
+  border-radius: 4px;
+  color: #FFFFFF;
+  font-family: PingFang;
+}
 </style>

package/src/filiale/yangchunboneng/pc/ExplorationSelect.vue

@@ -68,6 +68,12 @@
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_phone like '%{}%'">
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户评价：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='用户评价' v-model="model.f_user_appraise"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_user_appraise like '%{}%'">
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
               <input type="text" style="width:60%" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
@@ -79,13 +85,13 @@
               <v-select
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
-                condition="f_apply_type = '{}'"
+                condition="f_apply_type in {}"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
                 class="select select_list"
-                :value-single="true"
+                :multiple="true"
                 @change="$parent.$parent.applyTypeChange()"
-                close-on-select ></v-select>
+                ></v-select>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">办理环节：</label>
@@ -199,6 +205,7 @@
             <th style="white-space: nowrap;">办理环节</th>
             <th style="white-space: nowrap;">流程状态</th>
             <th style="white-space: nowrap;">报建日期</th>
+            <th style="white-space: nowrap;">用户评价</th>
           </tr>
         </template>
         <template partial='body'>
@@ -257,6 +264,9 @@
             <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_date}}</font></nobr>
             </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_user_appraise}}</font></nobr>
+            </td>
           </tr>
         </template>
       </data-grid>
@@ -416,19 +426,49 @@
         this.$dispatch('search')
       },
       async applyTypeChange () {
-        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
-          let res = await this.$resetpost('rs/logic/getDefnameByType',
-            { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
-            {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
-          )
+        //判断this.$refs.cp.$refs.cri.model.f_apply_type是不是数组
+        if (Array.isArray(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+          if(this.$refs.cp.$refs.cri.model.f_apply_type.length>0){
+            for (let i = 0; i < this.$refs.cp.$refs.cri.model.f_apply_type.length; i++) {
+              let res = await this.$resetpost('rs/logic/getDefnameByType',
+                { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type[i] },
+                {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
+              )
+              if (!isEmpty(res.data)) {
+                const newDefnames = [{ label: '全部', value: '' }, ...res.data];
+                const newApplyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type[i]}性质`))
+                  ? [{ label: '全部', value: '' }]
+                  : [{ label: '全部', value: '' }, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type[i]}性质`)];
+                // 检查并追加 defnames
+                newDefnames.forEach(item => {
+                  if (!this.defnames.some(defname => defname.value === item.value)) {
+                    this.defnames.push(item);
+                  }
+                });
+                // 检查并追加 applyNatures
+                newApplyNatures.forEach(item => {
+                  if (!this.applyNatures.some(applyNature => applyNature.value === item.value)) {
+                    this.applyNatures.push(item);
+                  }
+                });
+              }
+            }
+          }
+        }else{
+          if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+            let res = await this.$resetpost('rs/logic/getDefnameByType',
+              { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
+              {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
+            )
 
-          this.defnames = [{label: '全部', value: ''}, ...res.data]
+            this.defnames = [{label: '全部', value: ''}, ...res.data]
 
-          this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
-        } else {
-          this.defnames = [{label: '全部', value: ''}]
+            this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
+          } else {
+            this.defnames = [{label: '全部', value: ''}]
 
-          this.applyNatures = [{label: '全部', value: ''}]
+            this.applyNatures = [{label: '全部', value: ''}]
+          }
         }
       },
       clear () {