apply-clients 3.5.4-66 → 3.5.4-68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.5.4-66",
+  "version": "3.5.4-68",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -86,7 +86,7 @@
         // 控制组件
         if (this.selectdata.components) {
           this.selectdata.components.forEach(item => {
-            item.mark = 2
+            item.mark =item.mark
           })
         }
 

package/src/components/product/ServiceView.vue

@@ -455,6 +455,7 @@
         </footer>
       </modal>
     </form>
+    </validator>
   </div>
 </template>
 <script>

package/src/filiale/gongyi/android/AppSign.vue

@@ -31,6 +31,19 @@ export default {
     console.log('在ready里打印一下this.filePath',this.filePath)
     this.f_sign_path = this.filePath
     console.log('在ready里打印一下this.f_sign_path',this.f_sign_path)
+    //判断this.filePath
+    if (this.filePath !== null || this.filePath !== '') {
+      // 定义照片格式的扩展名数组
+      const imageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff'];
+      // 获取文件扩展名
+      const fileExtension = this.filePath.toLowerCase().substring(this.filePath.lastIndexOf('.'));
+      // 判断文件扩展名是否在照片格式数组中
+      if (imageExtensions.includes(fileExtension)) {
+        console.log('这是一个照片文件');
+      } else {
+        this.f_sign_path=null
+      }
+    }
     this.getFiles()
   },
   methods: {
@@ -80,8 +93,8 @@ export default {
       console.log('-----------bzLogic-----------------')
       console.log(JSON.stringify(data))
       let res = HostApp.bzLogic({
-          'logic': 'appFileUpload',
-         'data': data
+        'logic': 'appFileUpload',
+        'data': data
       })
       console.log('===============上传回调=================')
       console.log(JSON.stringify(res))
@@ -108,7 +121,7 @@ export default {
           debugger
           fileUrl= `${this.$androidUtil.getProxyUrl()}/${newPath}`
         }else {
-        fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
+          fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
         }
         console.log(fileUrl)
         this.f_sign_path = fileUrl

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

@@ -2,14 +2,25 @@
   <div class="col-sm-12" style="background-color: #FFFFFF">
     <div class="col-sm-12" style="padding:50px 100px;height: 25%">
       <div class="form-group col-sm-5" v-if="issearch">
+        <label class="col-sm-2 control-label">文件类型：</label>
         <v-select
           class="select select_list"
           :value.sync="useType"
-          width="90%"
+          width="50%"
           v-model="useType"
           :options='typeOfUse'
           :valueSingle="true"></v-select>
       </div>
+      <div class="form-group col-sm-5" v-if="issearch" >
+        <label class="col-sm-2 control-label">环节：</label>
+        <v-select
+          class="select select_list"
+          :value.sync="defname"
+          width="50%"
+          v-model="defname"
+          :options='defnames'
+          :valueSingle="true"></v-select>
+      </div>
       <div class="form-group col-sm-2" style="text-align: center" v-if="issearch">
         <button type="button" class="btn btn-primary item_btn" @click="load">搜索</button>
       </div>
@@ -43,7 +54,7 @@
             <p :title="row.fremarks" class="clears"><strong>文件说明：</strong>{{row.fremarks}}</p>
             <p class="clears">
               <a v-if="row.f_filetype === 'jpg' || row.f_filetype === 'txt' || row.f_filetype==='png' || row.f_filetype==='gif' || row.f_filetype==='bmp'" :href="row.f_downloadURL" style="background:#6aa6e2" class="btn btn-primary" target="_blank" role="button">预览</a>
-              <a v-else  @click="downloadfile(row.f_downloadURL)" style="background:#6aa6e2" class="btn btn-primary" role="button">下载</a>
+              <a v-else  @click="downloadfile(row.f_downloadURL,row)" style="background:#6aa6e2" class="btn btn-primary" role="button">下载</a>
               <a v-if="isdelete" @click="delet($index, row)" href="#" class="btn btn-default" role="button" role="button">删除</a>
             </p>
           </div>
@@ -102,11 +113,14 @@ export default {
   props: ['blodid', 'businessid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'isdelete', 'bootstraped', 'issearch','source'],
   data () {
     return {
+      unlookfile:  [ ...this.$appdata.getParam('附件限制类型')],
+      defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建节点')],
       fileInfoData: [], // 数据库存储的文件记录对象数组
       headers: {'username': this.$login.f.name, 'blodid': '','businessid':'', 'fremarks': '','defname':'','fusetype':''}, // 调用rs/file/uploadFile 的参数
       showUpload: false, // 上传模态框控制
       showhighmeter: false, // 高拍仪组件控制
-      useType: null
+      useType: null,
+      defname:null
     }
   },
   ready () {
@@ -118,31 +132,6 @@ export default {
     }
   },
   methods: {
-    checkrole(){
-      let  arry =this.$appdata.getParam(this.defname+'附件')
-      if(arry!==undefined && arry!==null){
-        for (let i = 0; i < arry.length; i++) {
-          if(this.$login.f.rolestr.includes(arry[i].value )){
-            this.look=true
-          }
-          if(this.$login.r.includes('查看全部附件') || this.look){
-            this.headers.blodid = this.blodid
-            this.headers.businessid = this.businessid
-            this.headers.defname = this.defname
-            if (this.blodid || this.businessid) {
-              this.load()
-            }
-          }
-        }
-      }else{
-        this.headers.blodid = this.blodid
-        this.headers.businessid = this.businessid
-        this.headers.defname = this.defname
-        if (this.blodid || this.businessid) {
-          this.load()
-        }
-      }
-    },
     delet(index, row) {
       //判断是否有删除文件的权限
       if(this.$login.r.includes('附件删除')){
@@ -155,7 +144,16 @@ export default {
       }
     },
     // 下载
-    downloadfile(filepath){
+    downloadfile(filepath,row){
+      //判断当前文件的使用类型，是否是限制查看的附件
+      for (let i = 0; i < this.unlookfile.length; i++) {
+        if(row.fusetype===this.unlookfile[i].value){
+          if(!this.$login.r.includes('查看全部附件')){
+            this.$showMessage('您暂无查看当前附件的权限')
+            return
+          }
+        }
+      }
       let name1= this.extractFileNameFromUrl(filepath)
       let name=this.extractFileName(name1)
       if(filepath.toString().endsWith(".dwg")){
@@ -218,13 +216,12 @@ export default {
       }else{
         condition = `f_blobid= '${this.headers.blodid}' `
       }
-      if(!this.$login.r.includes('查看全部附件')){
-        //有权限查看所有，没有权限,限制环节
-        condition +=`  and defname not  in  ${this.appDefnames} `
-      }
       if (!isEmpty(this.useType)) {
         condition += `and fusetype like '${this.useType}'`
       }
+      if (!isEmpty(this.defname)) {
+        condition += `and defname = '${this.defname}'`
+      }
       let http = new HttpResetClass()
       let data = {
         tablename: 't_files',
@@ -322,10 +319,6 @@ export default {
   computed: {
     typeOfUse () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('报建-使用类型')]
-    },
-    appDefnames () {
-      let list = this.$appdata.getParam('附件限制节点')
-      return `(${list.map(item => `'${item.value}'`).toString()})`
     }
   },
   events: {

package/src/filiale/gongyi/pc/PcAddLogs.vue

@@ -3,6 +3,7 @@
     <data-grid :model="onetomany" class="list_area table_sy">
       <template partial='head'>
         <tr>
+          <th class="textNoLineBreak">记录人</th>
           <th class="textNoLineBreak">日期</th>
           <th class="textNoLineBreak">类型</th>
           <th class="textNoLineBreak">内容</th>
@@ -14,6 +15,9 @@
       </template>
       <template partial='body'>
         <tr>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
           <td style="text-align: center;">
             <nobr>{{row.f_operation_date}}</nobr>
           </td>

package/src/filiale/gongyi/pc/PcLegacyIssues.vue

@@ -99,14 +99,9 @@
               </div>
             </div>
             <div class="form-group col-sm-6" >
-              <label class="col-sm-4 control-label">处理方式：</label>
+              <label class="col-sm-4 control-label">处理结果：</label>
               <div class="col-sm-8">
-                <input-select
-                  class="select select_list"
-                  :value.sync="item.f_dispose_manner"
-                  v-model="item.f_dispose_manner"
-                  :options="disOptions"
-                  :valueSingle="true"></input-select>
+                <input v-model="item.f_dispose_manner"></input>
               </div>
             </div>
           </div>
@@ -182,7 +177,7 @@ export default {
         id:this.content[0].id,
         f_process_id:this.selectdata.f_process_id,
         f_dispose_time:new Date().Format('yyyy-MM-dd HH:mm:ss'),
-        f_dispose_person:Vue.user.name,
+        f_dispose_person:this.$login.f.name,
         f_dispose_manner:this.content[0].f_dispose_manner,
         f_is_dispose:this.content[0].f_is_dispose
       }
@@ -218,8 +213,8 @@ export default {
         f_process_id:this.selectdata.f_process_id,
         f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
         f_log_content:this.materials[0].f_log_content,
-        f_operator:Vue.user.name,
-        f_operator_id:Vue.user.id
+        f_operator:this.$login.f.name,
+        f_operator_id:this.$login.f.id
       }
       let data = {
         tableName:'t_legacy_issues',
@@ -240,8 +235,8 @@ export default {
         f_process_id:this.selectdata.f_process_id,
         f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
         f_log_content:this.materials[0].f_log_content,
-        f_operator:Vue.user.name,
-        f_operator_id:Vue.user.id
+        f_operator:this.$login.f.name,
+        f_operator_id:this.$login.f.id
       }
       let data = {
         tableName:'t_legacy_issues',
@@ -300,9 +295,9 @@ export default {
         this.showMaterialModal = true
     },
     closeMaterials() {
+      this.showdispose= false
       this.getOnetoManyData()
       this.showMaterialModal = false
-      this.showdispose= false
     }
   }
 }

package/src/filiale/gongyi/pc/addMaterialScience.vue

@@ -97,7 +97,7 @@
                 :value.sync="item.material"
                 v-model="item.material"
                 :options="meterialOptions"
-                :disable="mark === 1"
+                :disable="mark===1"
                 @change="modifyOtherValue(i)"
                 :valueSingle="true"></input-select>
             </div>
@@ -107,6 +107,7 @@
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="text"
                      placeholder="材料名称"
+                     :readonly="enable"
                      v-model="item.f_material_name"
                      :value="item.f_material_name"
               />
@@ -117,6 +118,7 @@
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="text"
                      placeholder="材料型号"
+                     :readonly="enable"
                      v-model="item.f_material_style"
                      :value="item.f_material_style"
               />
@@ -127,6 +129,7 @@
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="text"
                      placeholder="材料编码"
+                     :readonly="enable"
                      v-model="item.f_material_code"
                      :value="item.f_material_code"
               />
@@ -137,6 +140,7 @@
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="text"
                      placeholder="材料单位"
+                     :readonly="enable"
                      v-model="item.f_material_unit"
                      :value="item.f_material_unit"
               />
@@ -157,6 +161,7 @@
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="number"
                      placeholder="使用数量"
+                     :readonly="enable"
                      v-model="item.f_use_number"
                      :value="item.f_use_number"
               />
@@ -169,6 +174,7 @@
               <input class="form-control input_view" style="" type="number"
                      placeholder="退库数量"
                      v-model="item.f_back_number"
+                     :readonly="enable"
                      :value.sync="item.f_back_number"
               />
             </div>
@@ -179,6 +185,7 @@
               <input class="form-control input_view" style=""
                      placeholder="材料标识"
                      v-model="item.f_material_code"
+                     :readonly="enable"
                      :value.sync="item.f_material_code"
               />
             </div>
@@ -213,6 +220,7 @@
     },
     data () {
       return {
+        enable:false,
         showMaterial: false,
         showFile: false,
         Rematerials:[
@@ -262,6 +270,9 @@
     },
     ready(){
       this.getOnetoManyData()
+      if(this.selectdata.defname==="材料用量审核"){
+        this.enable = true
+      }
     },
     methods: {
        ReturnInventory(row) {

package/src/filiale/gongyi/pc/chargeManagement.vue

@@ -695,6 +695,8 @@ export default {
 
       if (res.data.length <= 0) {
         this.$showAlert('暂无用户信息,请先建立用户档安', 'warning', 4000)
+        this.showCharge=false
+        return
       }
       this.useraddresList = res.data.map(item => {
         return {

package/src/filiale/yangchunboneng/android/AppInstallationMaterial.vue

@@ -624,17 +624,21 @@
         let otherdetail = []
         if (this.payNumber == 0) {
           otherdetail.push({
-            f_brand_spec: ['维修'],
+            f_brand_spec: ['报建通气物料'],
             f_typename: ['材料费'],
             f_typenumber: [],
             f_unitprice: 0,
             f_number: this.material.length
           })
         } else {
+          var  str="报建通气物料"
           this.material.forEach((row) => {
-            if (row.f_material_price != 0) {
+            if (row.f_material_price !== 0) {
+              if(row.f_material_name.name==="自闭阀"){
+                str="自闭阀"
+              }
               otherdetail.push({
-                f_brand_spec: [`${row.material_type? row.material_type : '材料费'}`],
+                f_brand_spec: [`${str}`],
                 f_typename: [`${row.f_material_name.name}`],
                 f_typenumber: [`${row.f_typenumber.name}`],
                 f_unitprice: row.f_material_price,