apply-clients 3.5.5-10 → 3.5.5-101

package/src/filiale/yangchunboneng/android/MaterIialOne.vue

@@ -70,6 +70,8 @@
   </div>
 </template>
 <script>
+import {isEmpty} from "../../../components/Util";
+
 export  default {
   props:["index",'item','materialnameandcode','typenumbers','newmaterialnameandcode','newmaterialnameandtype'],
   data(){
@@ -109,7 +111,25 @@ export  default {
       this.$emit('delete_material',i)
     }
   },
-  ready(){
+  ready () {
+    if (this.item.f_material_name && this.item.f_material_style) {
+      let f_material_name = ''
+      this.newmaterialnameandcode.filter((item) => {
+        if (item.label == this.item.f_material_name) {
+          f_material_name = item.value
+        }
+      })
+      this.item.f_material_name = f_material_name
+      this.changeMaterialName(f_material_name)
+      let f_typenumber = ''
+      this.materialnameandtype.filter((item) => {
+        if (item.label == this.item.f_material_style) {
+          f_typenumber = item.value
+        }
+      })
+      this.item.f_typenumber = f_typenumber
+      this.changeType(f_typenumber)
+    }
     console.log(this.item)
   }
 }

package/src/filiale/yangchunboneng/android.js

@@ -14,7 +14,8 @@ let specialComp = {
   'apply-material-one': (resolve) => { require(['./android/MaterIialOne'], resolve) },
   'app-supervisory-cart': (resolve) => { require(['./android/AppSupervisoryCart'], resolve) },
   'app-contract-charge': (resolve) => { require(['./android/AppContractCharge'], resolve) },
-  'app-upload': (resolve) => { require(['./android/AppUpload'], resolve) }
+  'app-upload': (resolve) => { require(['./android/AppUpload'], resolve) },
+  'app-process-supervisory': (resolve) => { require(['./android/AppProcessSupervisory'], resolve) }
 
 }
 exports.specialComp = specialComp

package/src/filiale/yangchunboneng/pc/ApplyChargeList.vue

@@ -37,7 +37,7 @@
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-              <export-excel :data="$parent.$parent.getCondition"
+              <export-excel v-if="$parent.$parent.projectImport" :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
                             sqlurl="rs/logic/applyExportfile"
                             sql-name="getApplyCharge"
@@ -250,6 +250,28 @@
                           condition="cr.f_confirm_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-3">
+              <label  class="font_normal_body">实际时间：</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.f_shiji_date"
+                          :value.sync="model.f_shiji_date"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="cr.f_actual_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label  class="font_normal_body">实际时间：</label>
+              <datepicker id="startDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.f_shiji_enddate"
+                          :value.sync="model.f_shiji_enddate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="cr.f_actual_date <= '{}'">
+              </datepicker>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用气性质：</label>
               <v-select
@@ -270,6 +292,7 @@
           <tr>
             <th style="white-space: nowrap;">序号</th>
             <th style="white-space: nowrap;">工程编号</th>
+            <th style="white-space: nowrap;">用户编号</th>
             <th style="white-space: nowrap;">合同编号</th>
             <th style="white-space: nowrap;">合同金额</th>
             <th style="white-space: nowrap;">报建类型</th>
@@ -304,6 +327,9 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_userinfo_code}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
             </td>
@@ -429,9 +455,7 @@ export default {
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
       chargeStatus: [
         {label: '全部', value: ''},
-        {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'},
-        {label: '退款', value: '退款'}
+        ...this.$appdata.getParam('报建-缴费状态')
       ],
       confirms: [
         {label: '全部', value: ''},
@@ -452,6 +476,7 @@ export default {
         'f_contract_money': '合同金额',
         'f_apply_type': '报建类型',
         'f_apply_nature': '报建性质',
+        'f_userinfo_code': '用户编号',
         'f_user_name': '用户名称',
         'f_phone': '用户电话',
         'f_address': '用户地址',
@@ -608,6 +633,9 @@ export default {
       return {
         condition: this.model.condition
       }
+    },
+    projectImport () {
+      return this.$login.r.includes('收费明细-导出')
     }
   }
 }

package/src/filiale/yangchunboneng/pc/ApplyUpload.vue

@@ -22,13 +22,13 @@
       <div class="form-group col-sm-2" style="text-align: center" v-if="issearch">
         <button type="button" class="btn btn-primary item_btn" @click="load">搜索</button>
       </div>
-      <div class="form-group col-sm-2" style="text-align: center" v-if="isupload">
+      <div class="form-group col-sm-2" style="text-align: center" v-if="isupload&& this.$login.f.f_role_name.includes('报建附件-上传') ">
         <button type="button" class="btn btn-primary item_btn" @click="showUpload = !showUpload">本地上传</button>
       </div>
       <div class="form-group col-sm-2" style="text-align: center" v-if="takeimg">
         <button type="button" class="btn btn-primary item_btn" @click="upload()">拍照</button>
       </div>
-      <div class="form-group col-sm-2" style="text-align: center" v-if="isupload">
+      <div class="form-group col-sm-2" style="text-align: center" v-if="isupload && this.$login.f.f_role_name.includes('报建附件-删除') ">
         <button type="button" class="btn btn-primary item_btn" @click="deletefiles()">删除</button>
       </div>
     </div>
@@ -67,7 +67,7 @@
                   role="button">预览</a>
                 <a v-else @click="downloadfile(row.f_downloadURL)" style="background:#6aa6e2" class="btn btn-primary"
                    role="button">下载</a>
-                <a v-if="isdelete" @click="delet($index, row)" href="#" class="btn btn-default" role="button"
+                <a v-if="isdelete &&  this.$login.f.f_role_name.includes('报建附件-删除')" @click="delet($index, row)" href="#" class="btn btn-default" role="button"
                    role="button">删除</a>
               </p>
             </div>