manage-client 3.3.86 → 3.3.87

package/package.json

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

package/src/filiale/qianneng/QnAqzzYsmx.vue

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search" v-if="!show">
       <div class="flex">
-        <div style="flex:1;" class="flex" >
+        <!-- <div style="flex:1;" class="flex" > deleted-->
           <criteria-paged :model="model" v-ref:paged @sort="sort">
             <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
               <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
@@ -103,6 +103,59 @@
                     ></v-select>
                   </div>
                 </div>
+
+                <div class="row" v-show="$parent.$parent.criteriaShow">
+                  <div class="col-sm-2 form-group">
+                    <label for="startCreatetimegmt" class="font_normal_body">结算日期起</label>
+                    <datepicker id="startJsrq" placeholder="结算日期起" style="width:60%"
+                                v-model="model.startJsrq"
+                                :value.sync="model.startJsrq"
+                                :format="'yyyy-MM-dd HH:mm:ss'"
+                                :show-reset-button="true"
+                                condition="datefield_lmooize9 >= '{}'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="endCreatetimegmt" class="font_normal_body">结算日期止</label>
+                    <datepicker id="endJsrq" placeholder="结算日期止" style="width:60%"
+                                v-model="model.endJsrq"
+                                :value.sync="model.endJsrq"
+                                :format="'yyyy-MM-dd HH:mm:ss'"
+                                :show-reset-button="true"
+                                condition="datefield_lmooize9 <= '{}'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">结算人员</label>
+                    <v-select :value.sync="model.textfield_lmoi6q8p"
+                              :options='$parent.$parent.jsryArray' placeholder='请选择' v-model="model.textfield_lmoi6q8p" multiple
+                              condition="textfield_lmoi6q8p in {}"
+                    ></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">安装施工队伍</label>
+                    <v-select :value.sync="model.departmentselectfield_lmpm06s8"
+                              :options='$parent.$parent.jsbmArray' placeholder='请选择' v-model="model.departmentselectfield_lmpm06s8" multiple
+                              condition="departmentselectfield_lmpm06s8 in {}"
+                    ></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">队伍核对结果</label>
+                    <v-select :value.sync="model.textfield_lmpm06sb"
+                              :options='$parent.$parent.dwhdjgArray' placeholder='请选择' v-model="model.textfield_lmpm06sb" multiple
+                              condition="textfield_lmpm06sb in {}"
+                    ></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">是否结算</label>
+                    <v-select :value.sync="model.sfjs"
+                              :options="[{label: '全部', value: ''},{label: '已结算', value: '已结算'},{label: '未结算', value: '未结算'}]"
+                              placeholder='请选择'
+                              v-model="model.sfjs"
+                              condition="sfjs in {}"
+                    ></v-select>
+                  </div>
+                </div>
               </div>
             </criteria>
 
@@ -147,15 +200,30 @@
                   <th>
                     <nobr>宜达补贴项金额</nobr>
                   </th>
-
                   <th>
                     <nobr>与收费比对结果</nobr>
                   </th>
+
+                  <th>
+                    <div style="color: teal"><nobr>结算日期</nobr></div>
+                  </th>
+                  <th>
+                    <div style="color: teal"><nobr>结算人员</nobr></div>
+                  </th>
+                  <th>
+                    <div style="color: teal"><nobr>安装施工队伍</nobr></div>
+                  </th>
+                  <th>
+                    <div style="color: teal"><nobr>结算施工队伍</nobr></div>
+                  </th>
+                  <th>
+                    <div style="color: teal"><nobr>队伍核对结果</nobr></div>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
                 <td style="text-align: center;">
-                  <a href="javascript:void(0);" onclick="window.open('dingtalk://dingtalkclient/page/link?url=https%3A%2F%2Fyzidur.aliwork.com%2FAPP_FG6RSKCTOEQ3PYSLQT6H%2FprocessDetail%3FprocInsId%3D{{row.forminstanceid}}%26formUuid%3DFORM-4G8667A1HNWACQ0E7FV1U9SI1K0O2V0WSR9ILG%26isAdmin%3Dtrue%26isRenderNav%3Dfalse%26iframeState%3Dadmin%26isFromTable%3Dtrue%26ddtab%3Dtrue')">{{row.title}}</a>
+                  <nobr><a href="javascript:void(0);" onclick="window.open('dingtalk://dingtalkclient/page/link?url=https%3A%2F%2Fyzidur.aliwork.com%2FAPP_FG6RSKCTOEQ3PYSLQT6H%2FprocessDetail%3FprocInsId%3D{{row.forminstanceid}}%26formUuid%3DFORM-4G8667A1HNWACQ0E7FV1U9SI1K0O2V0WSR9ILG%26isAdmin%3Dtrue%26isRenderNav%3Dfalse%26iframeState%3Dadmin%26isFromTable%3Dtrue%26ddtab%3Dtrue')">{{row.title}}</a></nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.createtimegmt}}</nobr>
@@ -191,10 +259,25 @@
                 <td style="text-align: center;">
                   <nobr>{{row.ydbtxje}}</nobr>
                 </td>
-
                 <td style="text-align: center;">
                   <nobr>{{row.matchedaofeng}}</nobr>
                 </td>
+
+                <td style="text-align: center;">
+                  <nobr>{{row.datefield_lmooize9}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.textfield_lmoi6q8p}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.departmentselectfield_lmpm06s8}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.departmentselectfield_ln159o9v}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.textfield_lmpm06sb}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>
@@ -211,7 +294,7 @@
               </td>
             </tr>
           </table>
-        </div>
+        <!-- </div>deleted-->
 
       </div>
     </div>
@@ -257,6 +340,9 @@ export default {
       },
       originatorArray:[],
       modifyuserArray:[],
+      jsryArray:[],
+      jsbmArray:[],
+      dwhdjgArray:[],
       //默认打印列
       defaultfield: [],
       config: {
@@ -311,6 +397,9 @@ export default {
     //self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     this.getModifyuserArray();
     this.getOriginatorArray();
+    this.getJsryArray();
+    this.getJsbmArray();
+    this.getDwhdjgArray();
   },
   methods: {
     async getinputtores () {
@@ -373,6 +462,58 @@ export default {
       }
       this.modifyuserArray = nameArr
     },
+    async getJsryArray(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: "1=1",
+          tablename: 'qn_yida_azjslr',
+          groupitem: "textfield_lmoi6q8p",
+          orderitem: 'textfield_lmoi6q8p',
+          items: 'textfield_lmoi6q8p'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取失败!'})
+      let nameArr = []
+      for (let row of data.data){
+        nameArr.push({label: row.textfield_lmoi6q8p.replace("+"," "), value: row.textfield_lmoi6q8p.replace("+"," ")})
+      }
+      this.jsryArray = nameArr
+    },
+    async getJsbmArray(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: "1=1",
+          tablename: 'qn_yida_azjslr',
+          groupitem: "departmentselectfield_lmpm06s8",
+          orderitem: 'departmentselectfield_lmpm06s8',
+          items: 'departmentselectfield_lmpm06s8'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取失败!'})
+      let nameArr = []
+      for (let row of data.data){
+        nameArr.push({label: row.departmentselectfield_lmpm06s8.replace("+"," "), value: row.departmentselectfield_lmpm06s8.replace("+"," ")})
+      }
+      this.jsbmArray = nameArr
+    },
+    async getDwhdjgArray(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: "1=1",
+          tablename: 'qn_yida_azjslr',
+          groupitem: "textfield_lmpm06sb",
+          orderitem: 'textfield_lmpm06sb',
+          items: 'textfield_lmpm06sb'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取失败!'})
+      let nameArr = []
+      for (let row of data.data){
+        nameArr.push({label: row.textfield_lmpm06sb.replace("+"," "), value: row.textfield_lmpm06sb.replace("+"," ")})
+      }
+      this.dwhdjgArray = nameArr
+    },
+
     getotherfooter () {
       // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
       // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];

package/src/filiale/qianneng/exportConfig.js

@@ -223,7 +223,8 @@ export default{
   qnAqzzYsmx:{
     'title':'标题','createtimegmt':'发起时间','originator':'发起人','modifiedtimegmt':'验收时间','modifyuser':'验收人',
     'textfield_li9rszui':'用户编号','textfield_li9rszuj':'用户姓名',
-    'textfield_li9rszuo':'地址','afgxhje':'奥枫个性化金额','afbtxje':'奥枫补贴项金额','ydgxhje':'宜达个性化金额','ydbtxje':'宜达补贴项金额','matchedaofeng':'与收费比对结果'
+    'textfield_li9rszuo':'地址','afgxhje':'奥枫个性化金额','afbtxje':'奥枫补贴项金额','ydgxhje':'宜达个性化金额','ydbtxje':'宜达补贴项金额','matchedaofeng':'与收费比对结果',
+    'datefield_lmooize9':'结算日期','textfield_lmoi6q8p':'结算人员','departmentselectfield_lmpm06s8':'安装施工队伍','departmentselectfield_ln159o9v':'结算施工队伍','textfield_lmpm06sb':'队伍核对结果'
   },
 }