apply-clients 3.1.51 → 3.1.52

package/package.json

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

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

@@ -121,8 +121,9 @@
       </criteria>
       <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
         <template partial='head'>
-          <tr class="title">
+          <tr>
             <th>序号</th>
+            <th><div style="width:80px">流程操作</div></th>
             <th>报建编号</th>
             <th>当前环节</th>
             <th>客户名称/联系人</th>
@@ -131,7 +132,6 @@
             <th>地址</th>
             <th>报建类型</th>
             <th>报建日期</th>
-            <th>操作</th>
           </tr>
         </template>
         <template partial='body'>
@@ -139,6 +139,18 @@
             <td  style="text-align: center;">
               <nobr>{{$index+1}}</nobr>
             </td>
+            <td style="text-align: center;">
+              <dropdown>
+                <button @click="$parent.$parent.$parent.checkfuncs(row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                </button>
+                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+                  <li v-for="(index,func) in $parent.$parent.$parent.funcs">
+                    <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
@@ -163,18 +175,6 @@
             <td style="text-align: center;">
               <nobr>{{row.f_apply_date}}</nobr>
             </td>
-            <td style="text-align: center;">
-              <dropdown>
-                <button @click="$parent.$parent.$parent.checkfuncs(row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
-                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
-                </button>
-                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-                  <li v-for="(index,func) in $parent.$parent.$parent.funcs">
-                    <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
-                  </li>
-                </ul>
-              </dropdown>
-            </td>
           </tr>
         </template>
       </data-grid>

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

@@ -124,6 +124,7 @@
         <template partial='head'>
           <tr>
             <th>序号</th>
+            <th>流程操作</th>
             <th>报建编号</th>
             <th>客户名称/联系人</th>
             <th>当前状态</th>
@@ -133,7 +134,6 @@
             <th>地址</th>
             <th>报建类型</th>
             <th>报建日期</th>
-            <th>操作</th>
           </tr>
         </template>
         <template partial='body'>
@@ -141,6 +141,18 @@
             <td style="text-align: center;">
               <nobr><font>{{$index+1}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <dropdown>
+                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                </button>
+                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+                  <li>
+                    <a href="#" @click="$parent.$parent.$parent.click(row)">{{row.defname}}</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
@@ -168,18 +180,6 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_date}}</font></nobr>
             </td>
-            <td style="text-align: center;">
-              <dropdown>
-                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
-                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
-                </button>
-                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-                  <li>
-                    <a href="#" @click="$parent.$parent.$parent.click(row)">{{row.defname}}</a>
-                  </li>
-                </ul>
-              </dropdown>
-            </td>
           </tr>
         </template>
       </data-grid>

package/src/components/product/ReportForm/CustomerRecordMessage.vue

@@ -1488,26 +1488,27 @@
             //   }
             // })
             let http = new HttpResetClass()
-          let w = await http.load('POST', 'rs/logic/recordImport', data, {
+            await http.load('POST', 'rs/logic/recordImport', data, {
               resolveMsg: null,
               rejectMsg: '导入失败'
-            })
-              if(w.data) {
-                this.iswork = false;
+            }).then((res) => {
+              if(res.data){
+                this.iswork=false;
                 this.load();
                 this.closeFile();
                 let mm = '';
-                for (var i = 0; i < w.data.msg.length; i++) {
-                  mm += `${w.data.msg[i].msg}`
+                for(var i=0;i<res.data.msg.length;i++){
+                  mm+= `${res.data.msg[i].msg}`
                 }
-                let msg = `共导入${w.data.alllength}条,失败${w.data.errorlen}条,失败信息:${mm}`
-                if (w.data.code === 500) {
-                  this.iswork = false;
-                  msg = w.data.msg
+                let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
+                if (res.data.code == 500) {
+                  this.iswork=false;
+                  msg = res.data.msg
                 }
                 console.log("返回的数据：" + JSON.stringify(res.data))
                 this.$showMessage(msg)
               }
+            })
           // }catch(e){
           //
           //   this.$showAlert('导入出错,请检查导入文件模板格式!','danger',2000);
@@ -1532,26 +1533,27 @@
           };
           console.log('即将转发的数据',data);
           let http = new HttpResetClass()
-          let result = await http.load('POST', 'rs/logic/incrementImport', data, {
+          await http.load('POST', 'rs/logic/incrementImport', data, {
             resolveMsg: null,
             rejectMsg: '导入失败'
-          })
-            if(result.data){
+          }).then((res) => {
+            if(res.data){
               this.iswork=false;
               this.load();
               this.closeFile();
               let mm = '';
-              for(var i=0;i<result.data.msg.length;i++){
-                mm+= `${result.data.msg[i].msg}`
+              for(var i=0;i<res.data.msg.length;i++){
+                mm+= `${res.data.msg[i].msg}`
               }
-              let msg = `共导入${result.data.alllength}条,失败${result.data.errorlen}条,失败信息:${mm}`
-              if (result.data.code == 500) {
+              let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
+              if (res.data.code == 500) {
                 this.iswork=false;
-                msg = result.data.msg
+                msg = res.data.msg
               }
-              console.log("返回的数据：" + JSON.stringify(result.data))
+              console.log("返回的数据：" + JSON.stringify(res.data))
               this.$showMessage(msg)
             }
+          })
           // try{
           //   await axios.post('rs/logic/incrementImport',
           //     data).then((res)=>{