apply-clients 3.3.10 → 3.3.14

package/src/components/android/Process/Processes/AppDevicesManagement.vue

@@ -51,7 +51,79 @@
       </header>
       <article slot="modal-body" class="modal-body clearfix">
         <div v-for="(i, item) in userfile.devicesinfo" class="form-group col-xs-12 panel panel-info">
-          <div class="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">设备{{$index+1}}信息</div>
+          <div class="panel-heading head row" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-xs-6 text-left">设备{{$index+1}}信息</div>
+            <div class="col-xs-6 text-right"><button
+              class="btn btn-danger"
+              v-if="!item.id"
+              @click.prevent="deleteDevicesinfo(i)"
+            >删除</button></div>
+          </div>
+
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">设备类型：</label>
+            <div class="col-xs-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.f_devices_type"
+                v-model="item.f_devices_type"
+                :options="devicesType"
+                :disable="mark === 1"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">生产日期：</label>
+            <div class="col-xs-8">
+              <datepicker
+                placeholder="生产日期"
+                :value.sync="item.f_make_date"
+                v-model="item.f_make_date"
+                format="yyyy-MM-dd HH:mm:ss"
+                @change="expireDate($index)"
+                :disabled="mark === 1">
+              </datepicker>
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">设备数量：</label>
+            <div class="col-xs-8">
+              <input class="form-control input_view" style="" type="number"
+                     placeholder="设备数量"
+                     v-model="item.f_devices_num"
+                     :value="item.f_devices_num"
+                     :readonly="mark === 1"/>
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">安&ensp;装&ensp;人：</label>
+            <div class="col-xs-8">
+              <input class="form-control input_view" style=""
+                     placeholder="安装人"
+                     v-model="item.f_input_person"
+                     :value="installperson"
+                     readonly/>
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">安装日期：</label>
+            <div class="col-xs-8">
+              <input class="form-control input_view" style=""
+                     placeholder="安装日期"
+                     v-model="item.f_input_date"
+                     :value="installdate(item.f_input_date)"
+                     readonly/>
+              <!--              <datepicker-->
+              <!--                placeholder="安装日期"-->
+              <!--                :value.sync="item.f_input_date"-->
+              <!--                v-model="item.f_input_date"-->
+              <!--                format="yyyy-MM-dd HH:mm:ss"-->
+              <!--                :disabled="mark === 1">-->
+              <!--              </datepicker>-->
+            </div>
+          </div>
+
+          <!--
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label">设备类型：</label>
             <div class="col-xs-8">
@@ -245,6 +317,7 @@
               ></textarea>
             </div>
           </div>
+          -->
         </div>
 
       </article>
@@ -261,6 +334,23 @@ import {getNowDate,isEmpty} from '../../../Util'
 import {PagedList} from 'vue-client'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+// Date格式化
+Date.prototype.Format = function (fmt) {
+  var o = {
+    'M+': this.getMonth() + 1, // 月份
+    'd+': this.getDate(), // 日
+    'H+': this.getHours(), // 小时
+    'm+': this.getMinutes(), // 分
+    's+': this.getSeconds(), // 秒
+    'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+    'S': this.getMilliseconds() // 毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  }
+  return fmt
+}
 
 export default {
   title: '设备管理',
@@ -286,6 +376,9 @@ export default {
     this.search()
   },
   methods: {
+    deleteDevicesinfo (index) {
+      this.userfile.devicesinfo.splice(index, 1)
+    },
     async addDevice () {
       let data = {
         selectdata: this.selectdata,
@@ -356,6 +449,18 @@ export default {
   events: {
   },
   computed: {
+    // 安装人
+    installperson() {
+      return Vue.user.name
+    },
+    installdate() {
+      return function (f_install_date) {
+        if (isEmpty(f_install_date)) {
+          return new Date().Format('yyyy-MM-dd HH:mm:ss')
+        }
+        return f_install_date
+      }
+    },
     installType() {
       return this.$appdata.getParam("安装方式")
     },

package/src/components/android/Process/Processes/AppInstallationDetails.vue

@@ -51,7 +51,14 @@
         </div>
 
         <div v-for="(i, item) in userinfo.userfiles" class="form-group col-xs-12 panel panel-info">
-          <div class="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">表具{{$index+1}}信息</div>
+          <div class="panel-heading head row" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-xs-6 text-left">表具{{$index+1}}信息</div>
+            <div class="col-xs-6 text-right"><button
+              class="btn btn-danger"
+              v-if="!item.f_userfiles_id"
+              @click.prevent="deleteUserFile(i)"
+            >删除</button></div>
+          </div>
           <div class="form-group row vertical-center" :class="item.f_gasbrand_id ? '':'has-error'">
             <label class="col-xs-4 control-label">气表品牌：</label>
             <div class="col-xs-8">
@@ -144,24 +151,34 @@
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label">安&ensp;装&ensp;人：</label>
             <div class="col-xs-8">
-              <input-select
-                class="select select_list"
-                :value.sync="item.f_install_person"
-                v-model="item.f_install_person"
-                :options="installperson"
-                :valueSingle="true"></input-select>
+              <input class="form-control input_view" style=""
+                     v-model="item.f_install_person"
+                     :value.sync="installperson"
+                     placeholder="安装人"
+                     readonly/>
+<!--              <input-select-->
+<!--                class="select select_list"-->
+<!--                :value.sync="item.f_install_person"-->
+<!--                v-model="item.f_install_person"-->
+<!--                :options="installperson"-->
+<!--                :valueSingle="true"></input-select>-->
             </div>
           </div>
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label">安装日期：</label>
             <div class="col-xs-8">
-              <datepicker
-                placeholder="安装日期"
-                :value.sync="item.f_install_date"
-                v-model="item.f_install_date"
-                format="yyyy-MM-dd HH:mm:ss"
-                :show-reset-button="reset">
-              </datepicker>
+              <input class="form-control input_view" style=""
+                     v-model="item.f_install_date"
+                     :value.sync="installdate(item.f_install_date)"
+                     placeholder="安装日期"
+                     readonly/>
+<!--              <datepicker-->
+<!--                placeholder="安装日期"-->
+<!--                :value.sync="item.f_install_date"-->
+<!--                v-model="item.f_install_date"-->
+<!--                format="yyyy-MM-dd HH:mm:ss"-->
+<!--                :show-reset-button="reset">-->
+<!--              </datepicker>-->
             </div>
           </div>
         </div>
@@ -169,7 +186,7 @@
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <!-- 去除一户多表 -->
-        <button type="button" class="btn btn-primary" @click="addUserFile" v-if="false">添加表具</button>
+        <button type="button" class="btn btn-primary" @click="addUserFile">添加表具</button>
         <button type="button" class="btn btn-primary" @click="saveUserFile">确认</button>
       </footer>
     </modal>
@@ -181,6 +198,23 @@ import Vue from 'vue'
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
 import {isEmpty} from '../../../Util'
+// Date格式化
+Date.prototype.Format = function (fmt) {
+  var o = {
+    'M+': this.getMonth() + 1, // 月份
+    'd+': this.getDate(), // 日
+    'H+': this.getHours(), // 小时
+    'm+': this.getMinutes(), // 分
+    's+': this.getSeconds(), // 秒
+    'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+    'S': this.getMilliseconds() // 毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  }
+  return fmt
+}
 
 export default {
   title: '安装明细',
@@ -209,6 +243,10 @@ export default {
     this.getMeterbrands()
   },
   methods: {
+    // 删除未保存的表具
+    async deleteUserFile (index) {
+      this.userinfo.userfiles.splice(index, 1)
+    },
     // 追加表具
     addUserFile() {
       this.userinfo.userfiles.push({})
@@ -389,12 +427,15 @@ export default {
   computed: {
     // 安装人
     installperson() {
-      return this.$login.f.f_installman.map(item => {
-        return {
-          label: item.name,
-          value: item.name
+      return Vue.user.name
+    },
+    installdate() {
+      return function (f_install_date) {
+        if (isEmpty(f_install_date)) {
+          return new Date().Format('yyyy-MM-dd HH:mm:ss')
         }
-      })
+        return f_install_date
+      }
     },
     // 表向
     aroundmeters() {

package/src/components/android/Process/Processes/AppSupplementalAgreement.vue

@@ -206,7 +206,7 @@ export default {
       let http = new HttpResetClass()
       let data = {
         selectdata: this.selectdata,
-        user: Vue.name,
+        user: Vue.user,
         // user: {"f_show_department_name":"","parentname":"市场部","functions":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"客服系统","icon":"/images/lefticon/档案管理.png","hasright":false,"resourcetype":"function","parentid":"27","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"city-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"231","name":"街道管理","templatename":"functionedit","id":"230","position":"1","fullname":"资源管理.功能模块.客服系统.档案管理.街道管理","fullid":"3.21.27.212.230","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"area-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"219","name":"小区管理","templatename":"functionedit","id":"218","position":"3","fullname":"资源管理.功能模块.客服系统.档案管理.小区管理","fullid":"3.21.27.212.218","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"address-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"33664","name":"地址管理","templatename":"functionedit","id":"33663","position":"5","fullname":"资源管理.功能模块.客服系统.档案管理.地址管理","fullid":"3.21.27.212.33663","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"file-user-files","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"237","name":"用户档案","templatename":"functionedit","id":"236","position":"5","fullname":"资源管理.功能模块.客服系统.档案管理.用户档案","fullid":"3.21.27.212.236","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"档案管理","link":"file-user-files-new","hasright":true,"resourcetype":"function","parentid":"212","f_parentname":"档案管理","children":[],"selfid":"39450","name":"预备户管理","templatename":"functionedit","id":"39449","position":"6","fullname":"资源管理.功能模块.客服系统.档案管理.预备户管理","fullid":"3.21.27.212.39449","tablename":"t_function"}],"selfid":"213","name":"档案管理","templatename":"functionedit","id":"212","position":"2","fullname":"资源管理.功能模块.客服系统.档案管理","fullid":"3.21.27.212","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"客服系统","icon":"/images/lefticon/报建系统.png","hasright":true,"resourcetype":"function","parentid":"27","f_parentname":"客服系统","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"install-function","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34680","name":"功能业务","templatename":"functionedit","id":"34679","position":"1","fullname":"资源管理.功能模块.客服系统.报建业务.功能业务","fullid":"3.21.27.34673.34679","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"exploration-user","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34686","name":"流程业务","templatename":"functionedit","id":"34685","position":"2","fullname":"资源管理.功能模块.客服系统.报建业务.流程业务","fullid":"3.21.27.34673.34685","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"supervisory-control","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34692","name":"流程监控","templatename":"functionedit","id":"34691","position":"3","fullname":"资源管理.功能模块.客服系统.报建业务.流程监控","fullid":"3.21.27.34673.34691","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"apply-charge-search","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34698","name":"收费明细","templatename":"functionedit","id":"34697","position":"4","fullname":"资源管理.功能模块.客服系统.报建业务.收费明细","fullid":"3.21.27.34673.34697","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"order-apply","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34704","name":"预约申请","templatename":"functionedit","id":"34703","position":"5","fullname":"资源管理.功能模块.客服系统.报建业务.预约申请","fullid":"3.21.27.34673.34703","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"stop-apply","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34710","name":"终止报建","templatename":"functionedit","id":"34709","position":"6","fullname":"资源管理.功能模块.客服系统.报建业务.终止报建","fullid":"3.21.27.34673.34709","tablename":"t_function"}],"selfid":"34674","name":"报建业务","templatename":"functionedit","id":"34673","position":"12","fullname":"资源管理.功能模块.客服系统.报建业务","fullid":"3.21.27.34673","tablename":"t_function"}],"qrcode":"/rs/user/getQRcode?QRCODE=12b2-1631604191812-03447","rolesnames":"营业厅报装,市场部报装,设计部报装,工程部报装,运营部报装,财务部报装,角色监控","roles":"51383,51485,51707,51767,51833,51905,52289","f_sex":"男","f_icon":"tree_user","fullnames":"河南亿星集团实业有限公司.周口市天然气有限公司.市场部.报建测试","dir":"ZhouKou","userid":"12b2-1631604191812-03447","accesstime":"1632214307117","parentid":"46545","f_show_rolestr":"","fullids":"30463.10101.46545.51953.","number":"10101","f_dep_id":"1010101201","f_idnumber":null,"selfid":"51954","templatename":"useredit","logindate":"2021-09-14 18:46:54","id":"51953","state":"在职","tablename":"t_user","deptype":"部门","depids":"46545","loginid":"15","imgid":null,"f_user_telephone":null,"rolestr":"营业厅报装,市场部报装,设计部报装,工程部报装,运营部报装,财务部报装,角色监控","deps":"市场部","loginnum":"0","f_age":null,"resourcetype":"user","orgid":"10101","f_department_name":"周口市场部","ename":"bjcs","deleted":"false","entitytype":"t_user","f_description":null,"loginip":"192.168.66.37","name":"报建测试","position":"1","orgs":"周口市天然气有限公司","haslicense":true,"f_role_name":"营业厅报装 市场部报装 设计部报装 工程部报装 运营部报装 财务部报装 角色监控 ","f_allArea":[],"f_gasman":[{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"15294978548","rolestr":"抄表员","resourcetype":"user","userid":"100814","parentid":"46581","f_department_name":"周口客服部","ename":"100814","password":"1","deleted":"false","entitytype":"t_user","selfid":"100814","name":"高雪荣","templatename":"useredit","id":"100814","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"qrcode":"/rs/user/getQRcode?QRCODE=004","roles":"51959","f_sex":"男","f_icon":"tree_user","userid":"004","accesstime":"1631765198067","parentid":"46581","password":"1","selfid":"59044","templatename":"useredit","id":"59043","state":"在职","tablename":"t_user","loginid":"15","rolestr":"抄表员","resourcetype":"user","f_department_name":"周口客服部","ename":"cbcs","deleted":"false","entitytype":"t_user","loginip":"10.10.10.1","name":"抄表测试","position":"23","haslicense":"true","f_role_name":"抄表员 "},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"18538602709","rolestr":"抄表员","resourcetype":"user","userid":"100462","parentid":"46581","f_department_name":"周口客服部","ename":"100462","password":"1","deleted":"false","entitytype":"t_user","selfid":"100462","name":"刘林静","templatename":"useredit","id":"100462","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"18839409830","rolestr":"抄表员","resourcetype":"user","userid":"100528","parentid":"46581","f_department_name":"周口客服部","ename":"100528","password":"1","deleted":"false","entitytype":"t_user","selfid":"100528","name":"秦春梅","templatename":"useredit","id":"100528","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"13243376616","rolestr":"抄表员","resourcetype":"user","userid":"102935","parentid":"46581","f_department_name":"周口客服部","ename":"102935","password":"1","deleted":"false","entitytype":"t_user","selfid":"102935","name":"石磊","templatename":"useredit","id":"102935","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"18538602706","rolestr":"抄表员","resourcetype":"user","userid":"100818","parentid":"46581","f_department_name":"周口客服部","ename":"100818","password":"1","deleted":"false","entitytype":"t_user","selfid":"100818","name":"白静","templatename":"useredit","id":"100818","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"15294991670","rolestr":"抄表员","resourcetype":"user","userid":"102934","parentid":"46581","f_department_name":"周口客服部","ename":"102934","password":"1","deleted":"false","entitytype":"t_user","selfid":"102934","name":"郭新胜","templatename":"useredit","id":"102934","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"15036438918","rolestr":"抄表员","resourcetype":"user","userid":"103392","accesstime":"1631757950369","parentid":"46581","f_department_name":"周口客服部","ename":"103392","password":"1","deleted":"false","entitytype":"t_user","loginip":"10.10.10.1","selfid":"103392","name":"牛永胜","templatename":"useredit","id":"103392","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"13592232789","rolestr":"抄表员","resourcetype":"user","userid":"100337","parentid":"46581","f_department_name":"周口客服部","ename":"100337","password":"1","deleted":"false","entitytype":"t_user","selfid":"100337","name":"王雪丽","templatename":"useredit","id":"100337","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"17796528119","rolestr":"抄表员","resourcetype":"user","userid":"101021","parentid":"46581","f_department_name":"周口客服部","ename":"101021","password":"1","deleted":"false","entitytype":"t_user","selfid":"101021","name":"张书荣","templatename":"useredit","id":"101021","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"18839409832","rolestr":"抄表员","resourcetype":"user","userid":"100330","parentid":"46581","f_department_name":"周口客服部","ename":"100330","password":"1","deleted":"false","entitytype":"t_user","selfid":"100330","name":"武文平","templatename":"useredit","id":"100330","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"13839441227","rolestr":"抄表员","resourcetype":"user","userid":"100871","parentid":"46581","f_department_name":"周口客服部","ename":"100871","password":"1","deleted":"false","entitytype":"t_user","selfid":"100871","name":"李明磊","templatename":"useredit","id":"100871","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"}],"lics":[]},
         contract: this.contract
       }
@@ -228,7 +228,7 @@ export default {
       let http = new HttpResetClass()
       let data = {
         contract: this.contract,
-        user: Vue.name,
+        user: Vue.user,
         // user: {"f_show_department_name":"","parentname":"市场部","functions":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"客服系统","icon":"/images/lefticon/档案管理.png","hasright":false,"resourcetype":"function","parentid":"27","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"city-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"231","name":"街道管理","templatename":"functionedit","id":"230","position":"1","fullname":"资源管理.功能模块.客服系统.档案管理.街道管理","fullid":"3.21.27.212.230","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"area-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"219","name":"小区管理","templatename":"functionedit","id":"218","position":"3","fullname":"资源管理.功能模块.客服系统.档案管理.小区管理","fullid":"3.21.27.212.218","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"address-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"33664","name":"地址管理","templatename":"functionedit","id":"33663","position":"5","fullname":"资源管理.功能模块.客服系统.档案管理.地址管理","fullid":"3.21.27.212.33663","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"file-user-files","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"237","name":"用户档案","templatename":"functionedit","id":"236","position":"5","fullname":"资源管理.功能模块.客服系统.档案管理.用户档案","fullid":"3.21.27.212.236","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"档案管理","link":"file-user-files-new","hasright":true,"resourcetype":"function","parentid":"212","f_parentname":"档案管理","children":[],"selfid":"39450","name":"预备户管理","templatename":"functionedit","id":"39449","position":"6","fullname":"资源管理.功能模块.客服系统.档案管理.预备户管理","fullid":"3.21.27.212.39449","tablename":"t_function"}],"selfid":"213","name":"档案管理","templatename":"functionedit","id":"212","position":"2","fullname":"资源管理.功能模块.客服系统.档案管理","fullid":"3.21.27.212","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"客服系统","icon":"/images/lefticon/报建系统.png","hasright":true,"resourcetype":"function","parentid":"27","f_parentname":"客服系统","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"install-function","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34680","name":"功能业务","templatename":"functionedit","id":"34679","position":"1","fullname":"资源管理.功能模块.客服系统.报建业务.功能业务","fullid":"3.21.27.34673.34679","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"exploration-user","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34686","name":"流程业务","templatename":"functionedit","id":"34685","position":"2","fullname":"资源管理.功能模块.客服系统.报建业务.流程业务","fullid":"3.21.27.34673.34685","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"supervisory-control","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34692","name":"流程监控","templatename":"functionedit","id":"34691","position":"3","fullname":"资源管理.功能模块.客服系统.报建业务.流程监控","fullid":"3.21.27.34673.34691","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"apply-charge-search","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34698","name":"收费明细","templatename":"functionedit","id":"34697","position":"4","fullname":"资源管理.功能模块.客服系统.报建业务.收费明细","fullid":"3.21.27.34673.34697","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"order-apply","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34704","name":"预约申请","templatename":"functionedit","id":"34703","position":"5","fullname":"资源管理.功能模块.客服系统.报建业务.预约申请","fullid":"3.21.27.34673.34703","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"stop-apply","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34710","name":"终止报建","templatename":"functionedit","id":"34709","position":"6","fullname":"资源管理.功能模块.客服系统.报建业务.终止报建","fullid":"3.21.27.34673.34709","tablename":"t_function"}],"selfid":"34674","name":"报建业务","templatename":"functionedit","id":"34673","position":"12","fullname":"资源管理.功能模块.客服系统.报建业务","fullid":"3.21.27.34673","tablename":"t_function"}],"qrcode":"/rs/user/getQRcode?QRCODE=12b2-1631604191812-03447","rolesnames":"营业厅报装,市场部报装,设计部报装,工程部报装,运营部报装,财务部报装,角色监控","roles":"51383,51485,51707,51767,51833,51905,52289","f_sex":"男","f_icon":"tree_user","fullnames":"河南亿星集团实业有限公司.周口市天然气有限公司.市场部.报建测试","dir":"ZhouKou","userid":"12b2-1631604191812-03447","accesstime":"1632214307117","parentid":"46545","f_show_rolestr":"","fullids":"30463.10101.46545.51953.","number":"10101","f_dep_id":"1010101201","f_idnumber":null,"selfid":"51954","templatename":"useredit","logindate":"2021-09-14 18:46:54","id":"51953","state":"在职","tablename":"t_user","deptype":"部门","depids":"46545","loginid":"15","imgid":null,"f_user_telephone":null,"rolestr":"营业厅报装,市场部报装,设计部报装,工程部报装,运营部报装,财务部报装,角色监控","deps":"市场部","loginnum":"0","f_age":null,"resourcetype":"user","orgid":"10101","f_department_name":"周口市场部","ename":"bjcs","deleted":"false","entitytype":"t_user","f_description":null,"loginip":"192.168.66.37","name":"报建测试","position":"1","orgs":"周口市天然气有限公司","haslicense":true,"f_role_name":"营业厅报装 市场部报装 设计部报装 工程部报装 运营部报装 财务部报装 角色监控 ","f_allArea":[],"f_gasman":[{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"15294978548","rolestr":"抄表员","resourcetype":"user","userid":"100814","parentid":"46581","f_department_name":"周口客服部","ename":"100814","password":"1","deleted":"false","entitytype":"t_user","selfid":"100814","name":"高雪荣","templatename":"useredit","id":"100814","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"qrcode":"/rs/user/getQRcode?QRCODE=004","roles":"51959","f_sex":"男","f_icon":"tree_user","userid":"004","accesstime":"1631765198067","parentid":"46581","password":"1","selfid":"59044","templatename":"useredit","id":"59043","state":"在职","tablename":"t_user","loginid":"15","rolestr":"抄表员","resourcetype":"user","f_department_name":"周口客服部","ename":"cbcs","deleted":"false","entitytype":"t_user","loginip":"10.10.10.1","name":"抄表测试","position":"23","haslicense":"true","f_role_name":"抄表员 "},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"18538602709","rolestr":"抄表员","resourcetype":"user","userid":"100462","parentid":"46581","f_department_name":"周口客服部","ename":"100462","password":"1","deleted":"false","entitytype":"t_user","selfid":"100462","name":"刘林静","templatename":"useredit","id":"100462","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"18839409830","rolestr":"抄表员","resourcetype":"user","userid":"100528","parentid":"46581","f_department_name":"周口客服部","ename":"100528","password":"1","deleted":"false","entitytype":"t_user","selfid":"100528","name":"秦春梅","templatename":"useredit","id":"100528","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"13243376616","rolestr":"抄表员","resourcetype":"user","userid":"102935","parentid":"46581","f_department_name":"周口客服部","ename":"102935","password":"1","deleted":"false","entitytype":"t_user","selfid":"102935","name":"石磊","templatename":"useredit","id":"102935","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"18538602706","rolestr":"抄表员","resourcetype":"user","userid":"100818","parentid":"46581","f_department_name":"周口客服部","ename":"100818","password":"1","deleted":"false","entitytype":"t_user","selfid":"100818","name":"白静","templatename":"useredit","id":"100818","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"15294991670","rolestr":"抄表员","resourcetype":"user","userid":"102934","parentid":"46581","f_department_name":"周口客服部","ename":"102934","password":"1","deleted":"false","entitytype":"t_user","selfid":"102934","name":"郭新胜","templatename":"useredit","id":"102934","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"15036438918","rolestr":"抄表员","resourcetype":"user","userid":"103392","accesstime":"1631757950369","parentid":"46581","f_department_name":"周口客服部","ename":"103392","password":"1","deleted":"false","entitytype":"t_user","loginip":"10.10.10.1","selfid":"103392","name":"牛永胜","templatename":"useredit","id":"103392","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"13592232789","rolestr":"抄表员","resourcetype":"user","userid":"100337","parentid":"46581","f_department_name":"周口客服部","ename":"100337","password":"1","deleted":"false","entitytype":"t_user","selfid":"100337","name":"王雪丽","templatename":"useredit","id":"100337","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"17796528119","rolestr":"抄表员","resourcetype":"user","userid":"101021","parentid":"46581","f_department_name":"周口客服部","ename":"101021","password":"1","deleted":"false","entitytype":"t_user","selfid":"101021","name":"张书荣","templatename":"useredit","id":"101021","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"18839409832","rolestr":"抄表员","resourcetype":"user","userid":"100330","parentid":"46581","f_department_name":"周口客服部","ename":"100330","password":"1","deleted":"false","entitytype":"t_user","selfid":"100330","name":"武文平","templatename":"useredit","id":"100330","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"},{"loginid":"1","roles":"51959","f_icon":"tree_user","f_user_telephone":"13839441227","rolestr":"抄表员","resourcetype":"user","userid":"100871","parentid":"46581","f_department_name":"周口客服部","ename":"100871","password":"1","deleted":"false","entitytype":"t_user","selfid":"100871","name":"李明磊","templatename":"useredit","id":"100871","position":"23","state":"在职","tablename":"t_user","f_role_name":"抄表员"}],"lics":[]},
         selectdata: this.selectdata
       }

package/src/components/android/Supervisory/AppProcessSupervisory.vue

@@ -4,12 +4,6 @@
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div partial class="auto">
           <div class="row form-group app-input">
-            <label class="">项目名称：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_entry_name condition="u.f_entry_name like '%{}%'" />
-            </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">客户名称：</label>
             <div class="col-xs-8" >
               <input class="" v-model=model.f_user_name condition="u.f_user_name like '%{}%'" />
@@ -112,10 +106,6 @@
       <list :model="model" partial='list'>
         <div partial class="auto app-text panel">
           <div class="panel-body panel-self">
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_entry_name }}</p>
-            </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>客户名称：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_user_name }}</p>

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -58,11 +58,6 @@
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="a.f_apply_num = '{}'">
             </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">项目名称：</label>
-              <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_entry_name like '%{}%'" placeholder='项目名'>
-            </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"
@@ -125,7 +120,6 @@
           <tr>
             <th>序号</th>
             <th>工程编号</th>
-            <th>项目名称</th>
             <th>合同编号</th>
             <th>报建类型</th>
             <th>缴费编码</th>
@@ -145,9 +139,6 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_entry_name}}</font></nobr>
-            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
             </td>

package/src/components/product/Function/InstallInfoSelect.vue

@@ -20,9 +20,9 @@
                      condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">项目名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_entry_name like '%{}%'" placeholder='项目名称'>
+              <label class="font_normal_body">客户名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
             </div>
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
@@ -36,11 +36,6 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">客户名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
-            </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_phone"
@@ -113,8 +108,7 @@
         <template partial='head'>
           <tr class="title">
             <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>
@@ -134,9 +128,6 @@
             <td style="text-align: center;">
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_entry_name}}</nobr>
-            </td>
             <td style="text-align: center;">
               <nobr>{{row.f_user_name}}</nobr>
             </td>

package/src/components/product/Order/OrderMessage.vue

@@ -87,10 +87,6 @@
       <!-- 项目信息 -->
       <div class="auto" v-if="selectdata.f_ordertype !== '预约点火' &&  (type === 'process' || selectdata.f_orderstate === '预约成功')">
         <div class="col-sm-12 text-center bg-info pt-8">项目信息</div>
-        <div class="col-sm-6 form-group" :class="[$v.f_entry_name.required ? 'has-error' : '']">
-          <label class="font_normal_body">工程名称</label>
-          <input type="text" class="input_search" style="width: 60%" v-model="apply.f_entry_name" v-validate:f_entry_name = "['required']" :readonly="selectdata.f_orderstate === '预约成功'" />
-        </div>
         <div class="col-sm-6 form-group" v-if="selectdata.f_ordertype === '预约报装'" :class="[$v.f_apply_type.required ? 'has-error' : '']">
           <label class="font_normal_body">报建类型</label>
           <input type="text" v-show="false" v-validate:f_apply_type = "['required']" v-model="apply.f_apply_type">

package/src/components/product/Process/ExplorationSelect.vue

@@ -20,9 +20,9 @@
                        condition="f_apply_num = '{}'">
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">项目名称：</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_entry_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="f_entry_name like '%{}%'" placeholder='项目名称'>
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
               </div>
               <div class="form-group col-sm-3 button-range">
                 <button class="button_new button_spacing" style="width: max-content"
@@ -38,11 +38,6 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">客户名称：</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
-              </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_phone"
@@ -116,7 +111,6 @@
           <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>
@@ -137,9 +131,6 @@
             <td @click="$parent.$parent.$parent.click(row)" :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.click(row)" :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
-              <nobr><font>{{row.f_entry_name}}</font></nobr>
-            </td>
             <td @click="$parent.$parent.$parent.click(row)" :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
               <nobr><font>{{row.f_user_name}}</font></nobr>
             </td>
@@ -213,7 +204,7 @@
   </div>
 </template>
 <script>
-  import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
   import {isEmpty} from '../../Util'
 
   export default {
@@ -249,7 +240,9 @@
         let data = {
           workname: processname
         }
-        let res = await this.$resetpost(
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
           'rs/logic/getProcessId',
           {data: data},
           {resolveMsg: null, rejectMsg: '流程标识获取失败！！！'}

package/src/components/product/Process/ExplorationUser.vue

@@ -48,7 +48,9 @@
         let data = {
           workname: this.selectdata.processname
         }
-        let res = await this.$resetpost(
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
           'rs/logic/ApplyGetConfigs',
           {data: data},
           {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}