apply-clients 4.1.61 → 4.1.62-weinan

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -5,21 +5,21 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div class="form-group col-sm-4">
-              <label class="font_normal_body">项目名称/客户名称/联系人:</label>
-              <input type="text" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="search" condition=" (f_entry_name like '%{}%' or f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='三选一输入'>
+              <label class="font_normal_body">项目名称:</label>
+              <input type="text" class="input_search" v-model="model.f_entry_name"
+                     v-on:keyup.enter="search" condition=" f_entry_name like '%{}%' " placeholder='请输入'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">报建编号：</label>
               <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="search"
-                     condition="f_apply_num = '{}'">
+                     condition="f_apply_num like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
               <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
                    v-on:keyup.enter="search"
-                     condition="f_contract_number = '{}'">
+                     condition="f_contract_number like '%{}%'">
             </div>
             <div class="form-group col-sm-2 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
@@ -59,17 +59,29 @@
                 close-on-select ></v-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">联系电话：</label>
-              <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"
-                     v-on:keyup.enter="search"
-                     condition="f_phone like '%{}%'">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">用户地址：</label>
-              <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"
-                     v-on:keyup.enter="search"
-                     condition="f_address like '%{}%'">
+              <label class="font_normal_body">流程状态：</label>
+              <v-select
+                v-model="model.f_sub_state"
+                placeholder='流程状态'
+                condition="f_sub_state = '{}'"
+                :value.sync="model.f_sub_state"
+                :options='$parent.$parent.f_sub_state'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
             </div>
+<!--            <div class="form-group col-sm-3">-->
+<!--              <label class="font_normal_body">联系电话：</label>-->
+<!--              <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"-->
+<!--                     v-on:keyup.enter="search"-->
+<!--                     condition="f_phone like '%{}%'">-->
+<!--            </div>-->
+<!--            <div class="form-group col-sm-3">-->
+<!--              <label class="font_normal_body">用户地址：</label>-->
+<!--              <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"-->
+<!--                     v-on:keyup.enter="search"-->
+<!--                     condition="f_address like '%{}%'">-->
+<!--            </div>-->
             <div class="form-group col-sm-3">
               <label  for="startDate" class="font_normal_body">开始时间：</label>
               <datepicker id="startDate" placeholder="开始日期"
@@ -100,10 +112,10 @@
           <tr>
             <th style="white-space: nowrap;">序号</th>
             <th style="white-space: nowrap;">报建编号</th>
-            <th style="white-space: nowrap;">项目名称/客户名称/联系人</th>
+            <th style="white-space: nowrap;">项目名称</th>
             <th style="white-space: nowrap;">合同编号</th>
-            <th style="white-space: nowrap;">电话</th>
-            <th style="white-space: nowrap;">地址</th>
+<!--            <th style="white-space: nowrap;">电话</th>-->
+<!--            <th style="white-space: nowrap;">地址</th>-->
             <th style="white-space: nowrap;">报建类型</th>
             <th style="white-space: nowrap;">办理环节</th>
             <th style="white-space: nowrap;">流程状态</th>
@@ -119,17 +131,17 @@
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_entry_name}}/{{row.f_user_name}}/{{row.f_contact}}</nobr>
+              <nobr>{{row.f_entry_name}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_phone}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_address}}</nobr>
-            </td>
+<!--            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
+<!--              <nobr>{{row.f_phone}}</nobr>-->
+<!--            </td>-->
+<!--            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">-->
+<!--              <nobr>{{row.f_address}}</nobr>-->
+<!--            </td>-->
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_type}}</nobr>
             </td>
@@ -164,7 +176,8 @@
             orgid: this.$login.f.orgid
           }
         }),
-        defnames: [{label: '全部', value: ''}], // 流程节点
+        f_sub_state: [{label: '全部', value: ''}, {label: '完工', value: '完工'}, {label: '正在进行', value: '正在进行'}, {label: '终止', value: '终止'}],
+        defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
         criteriaShow: false
       }
     },
@@ -193,7 +206,7 @@
             this.defnames = [{label: '全部', value: ''}, ...res.data]
           })
         } else {
-          this.defnames = [{label: '全部', value: ''}]
+          this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
         }
       },
       check (val) {

package/src/components/product/Supervisory/SupervisoryhCart.vue

@@ -48,15 +48,8 @@
       },
       //点击获取节点名
       getdefname(row){
-        if(row.defname === this.$workflow_vue.start_activity){
           row = Object.assign({},this.selectdata,row)
           this.$dispatch('apply', row)
-        }else if(this.check(row.actorexpression)){
-          row = Object.assign({},this.selectdata,row)
-          this.$dispatch('apply', row)
-        }else{
-          this.$showMessage("对不起，您没有查看此节点的权限！")
-        }
       },
       // 检测是否有权限
       check(actorexpression){

package/src/components/product/Test.vue

@@ -1,7 +1,5 @@
 <template>
-  <div class="basic-main" style="height: 100%">
-    {{{ model }}}
-  </div>
+
 </template>
 
 <script>
@@ -32,5 +30,11 @@
 </script>
 
 <style scoped>
-
+.my-swipe .van-swipe-item {
+  color: #fff;
+  font-size: 20px;
+  line-height: 150px;
+  text-align: center;
+  background-color: #39a9ed;
+}
 </style>

package/src/components/product/VueUtils/ApplyUpload.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="col-sm-12" style="background-color: #FFFFFF">
-    <div class="col-sm-12" style="padding:50px 100px;height: 25%">
+    <div class="col-sm-12" style="padding:50px 100px;height: 25%;margin-left: -101px">
+      <div class="form-group col-sm-2">
+        <label>附件上传</label>
+      </div>
       <div class="form-group col-sm-5" v-if="issearch">
         <v-select
           class="select select_list"
@@ -35,7 +38,7 @@
           <div class="right col-sm-7">
             <p :title="row.f_filename" class="clears"><strong>文件名：</strong>{{row.f_filename}}</p>
             <p :title="row.f_username" class="clears"><strong>操作员：</strong><span>{{row.f_username}}</span></p>
-            <p :title="row.fusetype" class="clears"><strong>使用类型：</strong><span>{{row.fusetype}}</span></p>
+            <p :title="row.fusetype" class="clears"><strong>文件类型：</strong><span>{{row.fusetype}}</span></p>
             <p :title="row.f_uploaddate" class="clears"><strong>上传时间：</strong><span>{{row.f_uploaddate}}</span></p>
             <p :title="row.fremarks" class="clears"><strong>文件说明：</strong>{{row.fremarks}}</p>
             <p class="clears">
@@ -66,7 +69,7 @@
             class="select select_list"
             :value.sync="headers.fusetype"
             v-model="headers.fusetype"
-            :options="$appdata.getParam('使用类型')"
+            :options="$appdata.getParam('文件类型')"
             :valueSingle="true"></input-select>
         </div>
       </div>
@@ -86,6 +89,7 @@
 
 <script>
 import {HttpResetClass} from 'vue-client'
+import {isEmpty} from "../../Util";
 export default {
   title: '附件',
   props: ['blodid', 'businessid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'isdelete', 'bootstraped', 'issearch'],
@@ -137,9 +141,11 @@ export default {
       }else{
         condition = `f_blobid= '${this.headers.blodid}' `
       }
-      if(this.useType){
+      if(!isEmpty(this.useType)){
         condition += `and fusetype like '${this.useType}'`
       }
+      condition +=`and defname ='${this.defname}'`
+      console.log("附件查询条件",condition)
       var http = new HttpResetClass()
       let data = {
         tablename: 't_files',
@@ -151,7 +157,7 @@ export default {
       })
 
       for (var i = 0; i < getFile.data.length; i++) {
-        // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+        // 如果文件类型包含导入字样,则是execl文件导入的,不做显示
         if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
           getFile.data.splice(i,1)
           i--
@@ -159,7 +165,16 @@ export default {
         }
         let temp = getFile.data[i].f_downloadpath
         let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
-        getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
+        console.log("看看文件得路径：",URL)
+        let newURL = URL
+        if (URL.startsWith(":/")) {
+          newURL = URL.substring(2)
+        }
+        if (getFile.data[i].fremarks === '手机拍照'){
+          getFile.data[i].f_downloadURL = "http://" + location.host + "/" + "apply/android/" + newURL
+        }else {
+          getFile.data[i].f_downloadURL = "http://" + location.host + "/" + newURL
+        }
       }
       this.fileInfoData = []
       this.fileInfoData = getFile.data
@@ -208,7 +223,7 @@ export default {
   },
   computed: {
     typeOfUse () {
-      return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('文件类型')]
     }
   },
   events: {

package/src/main.js

@@ -7,7 +7,9 @@ import {sale} from 'sale-client'
 import {material} from 'material-client'
 
 import apply from './apply'
+import applyAndroid from './applyAndroid'
 
+applyAndroid()
 all()
 apply()
 ldap()