apply-clients 3.0.2-ys → 3.0.3-ys

package/package.json

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

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

@@ -54,14 +54,13 @@
                   </v-select>
                 </div>
               </div>
-              <div class="form-group col-sm-1">
-                <!--<label class="col-sm-6"> 报建类型：</label>-->
+              <!-- <div class="form-group col-sm-1">
                 <div class="col-sm-12">
                   <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.projecttype" placeholder='项目类型' condition="f_project_type  like '%{}%'"
                             v-model="model.f_project_type" :value.sync="model.f_project_type" close-on-select>
                   </v-select>
                 </div>
-              </div>
+              </div> -->
 <!--              <div class="form-group col-sm-1">-->
 <!--                <input type="text" class="form-control" placeholder='经办人' v-model="model.f_apply_operator"-->
 <!--                       v-on:keyup.enter="search"-->
@@ -102,9 +101,9 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
-              <th>
+              <!-- <th>
                 <nobr>项目类型</nobr>
-              </th>
+              </th> -->
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -142,9 +141,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
-              <td style="text-align: center;">
+              <!-- <td style="text-align: center;">
                 <nobr>{{row.f_project_type}}</nobr>
-              </td>
+              </td> -->
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
@@ -184,8 +183,9 @@
         refreshed:true,
         usertype: this.$appdata.getParam('用户类型'),
         defnameType: this.$appdata.getParam('流程状态'),
-        projecttype: this.$appdata.getParam('项目类型'),
-        applytype: [{label:"全部",value:''},{label:"新用户",value:'新用户'},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
+        // projecttype: this.$appdata.getParam('项目类型'),
+        // applytype: [{label:"全部",value:''},{label:"新用户",value:'新用户'},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
+        applytype: [{label:"零星散户",value:'零星散户'}],
         //中燃 专用
         fapplytype: this.$appdata.getParam('用户类型'),
         funcs:[],

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

@@ -57,14 +57,14 @@
                   </v-select>
                 </div>
               </div>
-              <div class="form-group col-sm-2">
+             <!-- <div class="form-group col-sm-2">
                 <label class="col-sm-6">项目类型:</label>
                 <div class="col-sm-6">
                   <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.projecttype" placeholder='项目类型' condition="f_project_type  like '%{}%'"
                             v-model="model.f_project_type" :value.sync="model.f_project_type" close-on-select>
                   </v-select>
                 </div>
-              </div>
+              </div> -->
               <div class="form-group col-sm-2">
                 <label class="col-sm-6">营业所:</label>
                 <div class="col-sm-6">
@@ -125,9 +125,9 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
-              <th>
+              <!-- <th>
                 <nobr>项目类型</nobr>
-              </th>
+              </th> -->
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -172,9 +172,9 @@
               <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"  style="text-align: center;">
                 <nobr><font>{{row.f_apply_type}}</font></nobr>
               </td>
-              <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"  style="text-align: center;">
+              <!-- <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"  style="text-align: center;">
                 <nobr><font>{{row.f_project_type}}</font></nobr>
-              </td>
+              </td> -->
               <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"  style="text-align: center;">
                 <nobr><font>{{row.f_apply_date}}</font></nobr>
               </td>
@@ -247,8 +247,8 @@
     data() {
       return {
         // applytype: [{label:"全部",value:''},...this.$appdata.getParam('报建类型')],
-        applytype: [{label:"全部",value:''},{label:"新用户",value:'新用户'},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
-        projecttype: this.$appdata.getParam('项目类型'),
+        applytype: [{label:"零星散户",value:'零星散户'}],
+        // projecttype: this.$appdata.getParam('项目类型'),
         business_office: this.$appdata.getParam('营业所'),
         // applytype: [{label:"全部",value:''},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
         timer: null,

package/src/components/product/Process/Processes/Service/ServiceControl.vue

@@ -141,6 +141,7 @@
       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;
   }
+ let num = 1;
 
   export default {
     title: '报建流程业务控制层',
@@ -500,7 +501,11 @@
         }
         // 下发人 options 处理，options初始化
         console.log("流程下发测试一-this.selectdata.actorexpression：",this.selectdata)
-        // 原代码
+        if (this.selectdata.defname == '用户建档'){
+          this.getBussTop10DataByTimer()
+        }
+
+          // 原代码
         // if (this.selectdata.defname == '开户申请' && this.selectdata.actorexpression) {
         if (this.selectdata.defname == '开户申请') {
           let http = new HttpResetClass()
@@ -1125,11 +1130,23 @@
             this.show_data.fields[i].required = false
           }
 
-          //所属公司
+          //所属公司和自动生成项目编号
           if (this.selectdata.defname == '用户建档') {
             if (this.show_data.fields[i].label === '所属公司') {
               this.show_data.fields[i].value = this.$login.f.orgs
             }
+            if (this.show_data.fields[i].label === '项目编号') {
+              var myDate = new Date();
+              var entryNum = 'WS'+myDate.getFullYear()+(parseInt(myDate.getMonth())+1<10?'0'+(parseInt(myDate.getMonth())+1):parseInt(myDate.getMonth())+1)+''+(parseInt(myDate.getDate())<10?'0'+myDate.getDate():myDate.getDate())
+              if(num<10){
+                entryNum+='000'+num
+              }else if(num<100){
+                entryNum+='00'+num
+              }else if(num<1000){
+                entryNum+='0'+num
+              }
+              this.show_data.fields[i].value = entryNum
+            }
             //placeholder  required
             if (this.selectdata.f_apply_type == '新用户') {
               if (this.show_data.fields[i].label === '项目名称' ||
@@ -1391,6 +1408,65 @@
         // }
       },
 
+      getBussTop10DataByTimer() {
+        let config={
+            time: '00:00:00', // 每天几点执行
+            interval: 1, // 隔几天执行一次
+            runNow: false, // 是否立即执行
+            intervalTimer: '',
+            timeOutTimer: ''
+          }
+    if (config.runNow) {
+      // 如果配置了立刻运行则立刻运行任务函数
+      this.initTopTenBusiness()
+    }
+    // 获取下次要执行的时间，如果执行时间已经过了今天，就让把执行时间设到明天的按时执行的时间
+    let nowTime = new Date().getTime()
+    let timePoint = config.time.split(':').map((i) => parseInt(i))
+    let recent = new Date().setHours(...timePoint) // 获取执行时间的时间戳
+    console.log("now",nowTime);
+    console.log("timepoint",timePoint);
+    console.log("recent",recent)
+    if (recent <= nowTime) {
+      // debugger
+      recent += 24 * 60 * 60 * 1000
+    }
+    // debugger
+    // 未来程序执行的时间减去现在的时间，就是程序要多少秒之后执行
+    let doRunTime = recent - nowTime
+    console.log("doRunTime",doRunTime)
+    // config.timeOutTimer = setTimeout(setTimer(), doRunTime)
+    config.timeOutTimer=setTimeout(()=>{
+      this.setTimer()
+    },doRunTime)
+  },
+
+   setTimer() {
+     let config={
+         time: '00:00:00', // 每天几点执行
+         interval: 1, // 隔几天执行一次
+         runNow: false, // 是否立即执行
+         intervalTimer: '',
+         timeOutTimer: ''
+       }
+    console.log('进入定时器')
+    //配置后的第一天12点执行
+    this.initTopTenBusiness()
+    // 每隔多少天再执行一次
+    let intTime = config.interval * 24 * 60 * 60 * 1000
+    // config.intervalTimer = setInterval(initTopTenBusiness, intTime)
+    config.intervalTimer=setInterval(()=>{
+      this.initTopTenBusiness()
+    },intTime)
+    // debugger
+    console.log("定时任务已经执行完毕")
+  },
+
+   initTopTenBusiness(){
+    num=1;
+    console.log("正在执行定时任务.......ing.....")
+  },
+
       dataChange(button_name) {
         let beforeData = this.data.fields
         let submitData = this.$refs.service_show.data.fields
@@ -2449,6 +2525,7 @@
             }
           }
         }
+
         //报建状态
         // if (this.selectdata.defname == '用户建档') {
         //   this.selectdata.f_sub_state = '未安装'
@@ -2947,11 +3024,12 @@
                 resolveMsg: null,
                 rejectMsg: "建档失败"
               })
+              num++;
               console.log("返回的消息：" + JSON.stringify(res.data))
               if (res.data != '建档成功') {
+                num--;
                 let check = await this.$showMessage(res.data, ['confirm', 'cancel'])
                 if (check == 'confirm') {
-
                 } else {
                   this.$refs.service_show.disable_button = false
                   return

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

@@ -66,14 +66,14 @@
                 </div>
               </div>
 <!--              <div class="form-group col-sm-2"></div>-->
-              <div class="form-group col-sm-2">
+              <!-- <div class="form-group col-sm-2">
                 <label class="col-sm-6">项目类型:</label>
                 <div class="col-sm-6">
                   <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.projecttype" placeholder='项目类型' condition="f_project_type  like '%{}%'"
                             v-model="model.f_project_type" :value.sync="model.f_project_type" close-on-select>
                   </v-select>
                 </div>
-              </div>
+              </div> -->
               <div class="form-group col-sm-2">
                 <label class="col-sm-6">营业所:</label>
                 <div class="col-sm-6">
@@ -126,9 +126,9 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
-              <th>
+              <!-- <th>
                 <nobr>项目类型</nobr>
-              </th>
+              </th> -->
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -166,9 +166,9 @@
               <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
-              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <!-- <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_project_type}}</nobr>
-              </td>
+              </td> -->
 
               <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
@@ -190,8 +190,9 @@
     title: '勘探详情',
     data() {
       return {
-        applytype: this.$appdata.getParam('报建类型'),
-        projecttype: this.$appdata.getParam('项目类型'),
+        // applytype: this.$appdata.getParam('报建类型'),
+        applytype:[{label:"零星散户",value:'零星散户'}],
+        // projecttype: this.$appdata.getParam('项目类型'),
         business_office: this.$appdata.getParam('营业所'),
         model: new PagedListLogic('rs/sql/supervisory', 20, {
           data: {
@@ -533,9 +534,9 @@
       defnameType() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('流程状态')]
       },
-      applytype() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]
-      }
+      // applytype() {
+      //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]
+      // }
     }
   }
 </script>