apply-clients 3.0.10-ys → 3.0.11-1

package/package.json

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

package/src/apply.js

@@ -184,6 +184,4 @@ export default function () {
   // 查询
   Vue.component('hidden-project-list', (resolve) => { require(['./components/product/HiddenDangersInProjects/HiddenProjectList'], resolve) })
 
-  Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
-
 }

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

@@ -54,13 +54,14 @@
                   </v-select>
                 </div>
               </div>
-              <!-- <div class="form-group col-sm-1">
+              <div class="form-group col-sm-1">
+                <!--<label class="col-sm-6"> 报建类型：</label>-->
                 <div class="col-sm-12">
                   <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.projecttype" placeholder='项目类型' condition="f_project_type  like '%{}%'"
                             v-model="model.f_project_type" :value.sync="model.f_project_type" close-on-select>
                   </v-select>
                 </div>
-              </div> -->
+              </div>
 <!--              <div class="form-group col-sm-1">-->
 <!--                <input type="text" class="form-control" placeholder='经办人' v-model="model.f_apply_operator"-->
 <!--                       v-on:keyup.enter="search"-->
@@ -101,9 +102,9 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
-              <!-- <th>
+              <th>
                 <nobr>项目类型</nobr>
-              </th> -->
+              </th>
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -141,9 +142,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
-              <!-- <td style="text-align: center;">
+              <td style="text-align: center;">
                 <nobr>{{row.f_project_type}}</nobr>
-              </td> -->
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
@@ -183,9 +184,8 @@
         refreshed:true,
         usertype: this.$appdata.getParam('用户类型'),
         defnameType: this.$appdata.getParam('流程状态'),
-        // projecttype: this.$appdata.getParam('项目类型'),
-        // applytype: [{label:"全部",value:''},{label:"新用户",value:'新用户'},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
-        applytype: [{label:"零星散户",value:'零星散户'}],
+        projecttype: this.$appdata.getParam('项目类型'),
+        applytype: [{label:"全部",value:''},{label:"新用户",value:'新用户'},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
         //中燃 专用
         fapplytype: this.$appdata.getParam('用户类型'),
         funcs:[],

package/src/components/product/HiddenDangersInProjects/AddHiddenDangers.vue

@@ -188,17 +188,16 @@
                 :valueSingle="true"/>
             </div>
           </div>
-
           <div class="col-sm-4 form-group item" >
-            <label class="control-label-justify control-label col-sm-6">项目实际整改费用（元）</label>
+            <label class="control-label-justify control-label col-sm-6">累计付款（元）</label>
             <div class="col-sm-6">
-              <input type="text" v-model="contract.f_actual_rectification_cost"  v-show="false">
+              <input type="text" v-model="contract.f_total_payment" v-show="false">
               <input
-                class="text"
                 type="number"
-                :readonly="type === 'view'"
-                :value.sync="contract.f_actual_rectification_cost"
-                v-model="contract.f_actual_rectification_cost"
+                class="text"
+                :readonly="true"
+                :value.sync="contract.f_total_payment"
+                v-model="contract.f_total_payment"
                 :valueSingle="true"/>
             </div>
           </div>
@@ -217,20 +216,20 @@
             </div>
           </div>
 
-          <div class="col-sm-4 form-group item">
-            <label class="control-label-justify control-label col-sm-6">工程款（元）</label>
-            <div class="col-sm-6">
-              <input type="text" v-model="contract.f_project_fee" v-show="false">
-              <input
-                type="number"
-                class="text"
-                :click="getpayment()"
-                :readonly="type === 'view'"
-                :value.sync="contract.f_project_fee"
-                v-model="contract.f_project_fee"
-                :valueSingle="true"/>
-            </div>
-          </div>
+<!--          <div class="col-sm-4 form-group item">-->
+<!--            <label class="control-label-justify control-label col-sm-6">工程款（元）</label>-->
+<!--            <div class="col-sm-6">-->
+<!--              <input type="text" v-model="contract.f_project_fee" v-show="false">-->
+<!--              <input-->
+<!--                type="number"-->
+<!--                class="text"-->
+<!--                :click="getpayment()"-->
+<!--                :readonly="type === 'view'"-->
+<!--                :value.sync="contract.f_project_fee"-->
+<!--                v-model="contract.f_project_fee"-->
+<!--                :valueSingle="true"/>-->
+<!--            </div>-->
+<!--          </div>-->
 
           <div class="col-sm-4 form-group item">
             <label class="control-label-justify control-label col-sm-6">人工款（元）</label>
@@ -247,15 +246,15 @@
           </div>
 
           <div class="col-sm-4 form-group item" >
-            <label class="control-label-justify control-label col-sm-6">累计付款（元）</label>
+            <label class="control-label-justify control-label col-sm-6">项目实际整改费用（元）</label>
             <div class="col-sm-6">
-              <input type="text" v-model="contract.f_total_payment" v-show="false">
+              <input type="text" v-model="contract.f_actual_rectification_cost"  v-show="false">
               <input
-                type="number"
                 class="text"
-                :readonly="true"
-                :value.sync="contract.f_total_payment"
-                v-model="contract.f_total_payment"
+                type="number"
+                :readonly="type === 'view'"
+                :value.sync="contract.f_actual_rectification_cost"
+                v-model="contract.f_actual_rectification_cost"
                 :valueSingle="true"/>
             </div>
           </div>
@@ -715,8 +714,8 @@
     methods: {
       async getpayment(){
         debugger
-        if(this.contract.f_materials_fee !=null && this.contract.f_project_fee !=null&&this.contract.f_artificial_fee !=null){
-          const leiji=parseFloat(parseFloat(this.contract.f_materials_fee)+parseFloat(this.contract.f_project_fee)+parseFloat(this.contract.f_artificial_fee)).toFixed(2)
+        if(this.contract.f_materials_fee !=null && this.contract.f_artificial_fee !=null){
+          const leiji=parseFloat(parseFloat(this.contract.f_materials_fee) + parseFloat(this.contract.f_artificial_fee)).toFixed(2)
           this.$set(`contract.f_total_payment`,leiji)
         }
       },

package/src/components/product/HiddenDangersInProjects/HiddenProjectList.vue

@@ -108,6 +108,7 @@
     <data-grid v-if="$parent.showData"  :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
       <template partial='head'>
         <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>
@@ -128,11 +129,16 @@
           <th style="white-space: nowrap;">工程款</th>
           <th style="white-space: nowrap;">人工款</th>
           <th style="white-space: nowrap;">是否属于年度预算内整改</th>
-          <th style="white-space: nowrap;">操作</th>
         </tr>
       </template>
       <template partial='body'>
         <tr >
+          <td :class="$parent.$parent.$parent.rowclass(row)" style="text-align: center;">
+            <nobr>
+              <a href="#" @click="$parent.$parent.$parent.openRenew(row)">修改</a>&emsp;|&emsp;
+              <a href="#" @click="$parent.$parent.$parent.deleteRow(row)">删除</a>
+            </nobr>
+          </td>
           <td :class="$parent.$parent.$parent.rowclass(row)" style="text-align: center;" @click="$parent.$parent.$parent.openViewContract(row)">
             <nobr><font>{{$index+1}}</font></nobr>
           </td>
@@ -193,12 +199,6 @@
           <td :class="$parent.$parent.$parent.rowclass(row)" style="text-align: center;" @click="$parent.$parent.$parent.openViewContract(row)">
             <nobr><font>{{row.f_hidden_budget_correction}}</font></nobr>
           </td>
-          <td :class="$parent.$parent.$parent.rowclass(row)" style="text-align: center;">
-            <nobr>
-                  <a href="#" @click="$parent.$parent.$parent.openRenew(row)">修改</a>&emsp;|&emsp;
-                  <a href="#" @click="$parent.$parent.$parent.deleteRow(row)">删除</a>
-            </nobr>
-          </td>
         </tr>
       </template>
     </data-grid>

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

@@ -57,14 +57,14 @@
                   </v-select>
                 </div>
               </div>
-             <!-- <div class="form-group col-sm-2">
+              <div class="form-group col-sm-2">
                 <label class="col-sm-6">项目类型:</label>
                 <div class="col-sm-6">
                   <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.projecttype" placeholder='项目类型' condition="f_project_type  like '%{}%'"
                             v-model="model.f_project_type" :value.sync="model.f_project_type" close-on-select>
                   </v-select>
                 </div>
-              </div> -->
+              </div>
               <div class="form-group col-sm-2">
                 <label class="col-sm-6">营业所:</label>
                 <div class="col-sm-6">
@@ -125,9 +125,9 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
-              <!-- <th>
+              <th>
                 <nobr>项目类型</nobr>
-              </th> -->
+              </th>
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -172,9 +172,9 @@
               <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"  style="text-align: center;">
                 <nobr><font>{{row.f_apply_type}}</font></nobr>
               </td>
-              <!-- <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"  style="text-align: center;">
+              <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"  style="text-align: center;">
                 <nobr><font>{{row.f_project_type}}</font></nobr>
-              </td> -->
+              </td>
               <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"  style="text-align: center;">
                 <nobr><font>{{row.f_apply_date}}</font></nobr>
               </td>
@@ -215,20 +215,6 @@
                 close-on-select ></v-select>
             </div>
           </div>
-          <div class="form-group" style="margin: 10px auto">
-            <label class="col-sm-3 control-label">用户类型：</label>
-            <div class="col-sm-9">
-              <v-select
-                v-model="f_user_type"
-                placeholder='请选择需要发起的用户类型'
-                :value.sync="f_user_type"
-                :options='usertype'
-                :value-single="true"
-                class="select select_list"
-                :search="false"
-                close-on-select ></v-select>
-            </div>
-          </div>
         </div>
         <footer slot="modal-footer" class="modal-footer">
           <button
@@ -261,9 +247,8 @@
     data() {
       return {
         // applytype: [{label:"全部",value:''},...this.$appdata.getParam('报建类型')],
-        applytype: [{label:"零星散户",value:'零星散户'}],
-        usertype:[{label:"民用",value:'民用'},{label:"非民用",value:'非民用'}],
-        // projecttype: this.$appdata.getParam('项目类型'),
+        applytype: [{label:"全部",value:''},{label:"新用户",value:'新用户'},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
+        projecttype: this.$appdata.getParam('项目类型'),
         business_office: this.$appdata.getParam('营业所'),
         // applytype: [{label:"全部",value:''},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
         timer: null,
@@ -285,10 +270,6 @@
         xmlname: '',
         startname: '用户建档',
         f_apply_type: '',
-        f_user_type: '',
-        f_order_id: '',
-        f_apply_num: '',
-        f_entry_num: '',
         entry_name: [], //项目名称
         entry_num: [],
         show: false,
@@ -408,17 +389,9 @@
         console.log("-------------modify:"+modify)
         this.show = false
         this.applyButton_disabled = true
-        console.log("用户类型为："+this.f_user_type)
-        if(this.f_user_type==='民用'){
-          this.urlname = "报建初装居民流程"
-          this.xmlname = "报建初装居民流程"
-        }else {
+        if (modify == '0'){
           this.urlname = "报建初装流程"
           this.xmlname = "报建初装流程"
-        }
-
-        if (modify == '0'){
-
           console.log(JSON.stringify(this.$login.f))
           this.loadName()
         }
@@ -434,12 +407,9 @@
           defname: this.startname,
           f_process_id: res.data.f_process_id,
           f_apply_date: Util.toStandardTimeString(),
-          f_apply_num: this.f_apply_num,
+          f_apply_num: this.generateUUID(),
           f_apply_operator_telephone: this.$login.f.f_fgsdianhua,
           f_apply_type: this.f_apply_type,
-          f_user_type: this.f_user_type,
-          f_order_id: this.f_order_id,
-          f_entry_num: this.f_entry_num,
           f_project_type: ''
 
         }
@@ -449,10 +419,6 @@
           val.f_project_type = '工商业'
         }
         this.f_apply_type = null
-        this.f_user_type = null
-        this.f_order_id = null
-        this.f_apply_num = null
-        this.f_entry_num = null
         console.log(112 + JSON.stringify(this.$login.f.f_apply_department))
         this.$dispatch('check', val)
         this.$dispatch('changeheight')