manage-client 3.3.57 → 3.3.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.57",
+  "version": "3.3.58",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -157,7 +157,7 @@
             </div>
           </div>
         </criteria>
-        <data-grid :model="model" class="list_area table_sy" id="queryinstruct" partial='list' v-ref:grid>
+        <data-grid :model="model" class="list_area table_sy" id="queryinstruct" partial='list' :modelval="$parent.$parent.modelval" v-ref:grid>
           <template partial='head'>
             <tr>
               <th style="text-align:center">
@@ -213,7 +213,15 @@
               <th style="text-align:center">
                 <nobr>记录状态</nobr>
               </th>
-              <th style="text-align:center"><nobr>组织机构</nobr></th>
+              <th style="text-align:center">
+                <nobr>组织机构</nobr>
+              </th>
+              <th style="text-align:center;">
+                <nobr>指令内容</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>指令详情</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -257,9 +265,9 @@
               </td>
               <td style="text-align:center"><nobr>{{row.f_send_date}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_callback_date}}</nobr></td>
-              <th style="text-align:center">
+              <td style="text-align:center">
                 <nobr>{{row.f_collection}}</nobr>
-              </th>
+              </td>
               <td style="text-align:center">
                 <nobr>{{row.note}}</nobr>
               </td>
@@ -281,11 +289,24 @@
               <td style="text-align:center">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
+              <td style="text-align:center;">
+                <nobr>{{row.f_instruct_content}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.instructDetail(row)">指令详情</button>
+              </td>
             </tr>
           </template>
         </data-grid>
       </criteria-paged>
     </div>
+    <modal :show.sync="detailShow" v-if="detailShow" width="40%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+        <p class="text-center" style="font-size: 15px" v-html="f_instruct_content"></p>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -342,16 +363,46 @@
             'f_orgname': '组织机构'
           }
         },
-        instructtitle: []
+        instructtitle: [],
+        detailShow: false,
+        f_instruct_content: '',
+        modelval: [
+          '序号','客户编号','客户名称','客户地址','表号','气表品牌','指令类型','指令标题','执行状态','执行结果','指令生成人','指令生成时间',
+          '指令发送时间','上表时间','充值金额','操作内容','操作原因','操作人(记录)','操作时间(记录)','操作类型','记录状态','组织机构'
+        ]
       }
     },
     ready () {
       readyGen(this)
       this.$refs.paged.$refs.criteria.model.f_start_date = Util.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.criteria.model.f_end_date = Util.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.grid.modelval = this.modelval
       //this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      instructDetail(row){
+        if (row.f_instruct_content != '{}') {
+          let data = JSON.parse(row.f_instruct_content)
+          console.log('看下具体的指令详情===>',data)
+          let str = ''
+          if (data.hasOwnProperty("Data")) {
+            console.log('看下具体的指令详情2===>',data.Data)
+            console.log('看下具体的指令详情2===>',typeof data.Data)
+            for (let key in data.Data) {
+              str =  str + key + ':' + data.Data[key] + '</br>'
+            }
+          }
+          for (let key in data) {
+            if (key != 'Data'){
+              str =  str + key + ':' + data[key] + '</br>'
+            }
+          }
+          this.f_instruct_content = str
+          this.detailShow = true
+        }else{
+          this.$showMessage('当前指令没有内容！！！', ['confirm'])
+        }
+      },
       hidden(){
         this.criteriaShow = !this.criteriaShow
       },
@@ -461,8 +512,11 @@
           this.f_orgid = `${this.f_orgid_new}`;
           //await this.$LoadParams.loadParam(this.f_orgid_new)
         }
-        this.model.search(args.condition, args.model)
-        this.initQueryParam();
+        await this.model.search(args.condition, args.model)
+        await this.initQueryParam();
+        await this.$refs.paged.$refs.grid.InitializedData()
+        await this.$refs.paged.$refs.grid.displayColumnSettings(undefined)
+
       },
 
     },