apply-clients 3.0.3-ys → 3.0.4-ys

package/package.json

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

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

@@ -141,7 +141,6 @@
       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: '报建流程业务控制层',
@@ -501,9 +500,6 @@
         }
         // 下发人 options 处理，options初始化
         console.log("流程下发测试一-this.selectdata.actorexpression：",this.selectdata)
-        if (this.selectdata.defname == '用户建档'){
-          this.getBussTop10DataByTimer()
-        }
 
           // 原代码
         // if (this.selectdata.defname == '开户申请' && this.selectdata.actorexpression) {
@@ -576,6 +572,7 @@
             }
           })
         }
+
         // selectdata 填充 data
         // this.data = Object.assign({}, this.data, this.selectdata)
         // onetomany 数据获取
@@ -1130,22 +1127,38 @@
             this.show_data.fields[i].required = false
           }
 
+          //对勘察时间进行转换
+          if (this.selectdata.defname == '现场勘察') {
+            if (this.show_data.fields[i].label === '勘察时间') {
+              this.show_data.fields[i].value = new Date().Format("yyyy-MM-dd HH:mm:ss")
+            }
+          }
+
           //所属公司和自动生成项目编号
           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
+              let http2 = new HttpResetClass()
+              let entryNum = await http2.load('POST', 'rs/logic/getProjectNo', {
+                data: {
+                  f_filiale: this.$login.f.orgs
+                }
+              }, {resolveMsg: null, rejectMsg: null})
+              console.log("生成的项目编号为：" + entryNum.data)
+              this.show_data.fields[i].value = entryNum.data
+
+            }
+            if (this.show_data.fields[i].label === '报建编号') {
+              let http2 = new HttpResetClass()
+              let applyNum = await http2.load('POST', 'rs/logic/getConstructionNo', {
+                data: {
+                  f_filiale: this.$login.f.orgs
+                }
+              }, {resolveMsg: null, rejectMsg: null})
+              console.log("生成的报建编号为：" + applyNum.data)
+              this.show_data.fields[i].value = applyNum.data
             }
             //placeholder  required
             if (this.selectdata.f_apply_type == '新用户') {
@@ -1217,6 +1230,7 @@
                     console.log("来了没2")
                     this.show_data.fields[k].hidden = false
                     this.show_data.fields[k].required = true
+                    this.show_data.fields[k].value = '抄表本2'
                   }
                 }
               }
@@ -1408,65 +1422,6 @@
         // }
       },
 
-      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
@@ -3024,10 +2979,8 @@
                 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 {