fix:单据创建默认主办协办

config/prod.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://210.12.156.64:9090/r/api"',
   fileUploadSvcPath:'"http://210.12.156.64:9090/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.6.6"'
+  currentVersion: '"3.6.7"'
 }

plugins/android.json

 {
-  "prepare_queue": {
-    "installed": [],
-    "uninstalled": []
-  },
-  "config_munge": {
-    "files": {}
-  },
-  "installed_plugins": {
-    "com.handmobile.cordovaplugin.hotpatch": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-camera": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-crosswalk-webview": {
-      "XWALK_VERSION": "22+",
-      "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
-      "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
-      "XWALK_MODE": "embedded",
-      "XWALK_MULTIPLEAPK": "true",
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-datepicker": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-device": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-dialogs": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-file": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-file-transfer": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-image-picker": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-media-capture": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-network-information": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-splashscreen": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-statusbar": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-whitelist": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "ionic-plugin-keyboard": {
-      "PACKAGE_NAME": "com.hls.app"
-    }
-  },
-  "dependent_plugins": {
-    "cordova-plugin-compat": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-contacts": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-themeablebrowser": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "cordova-plugin-x-toast": {
-      "PACKAGE_NAME": "com.hls.app"
-    },
-    "es6-promise-plugin": {
-      "PACKAGE_NAME": "com.hls.app"
+    "prepare_queue": {
+        "installed": [],
+        "uninstalled": []
+    },
+    "config_munge": {
+        "files": {}
+    },
+    "installed_plugins": {
+        "com.handmobile.cordovaplugin.hotpatch": {
+            "PACKAGE_NAME": "com.hls.app"
+        },
+        "cordova-plugin-camera": {
+            "PACKAGE_NAME": "com.hls.app"
+        }
+    },
+    "dependent_plugins": {
+        "cordova-plugin-compat": {
+            "PACKAGE_NAME": "com.hls.app"
+        },
+        "cordova-plugin-contacts": {
+            "PACKAGE_NAME": "com.hls.app"
+        }
     }
-  }
 }
\ No newline at end of file

src/pages/contractSigning/contract-detail.vue

@@ -87,7 +87,12 @@
     <h-content v-if="num === 0" class="business-condition">
       <list-item :item-height="44" class="second-part">
         <item>
-          <div slot="name" class="font-color">业务经办</div>
+          <div slot="name" class="font-color">业务主办</div>
+          <input
+            slot="content" v-model="baseInfo.bp_user_id_n" readonly>
+        </item>
+        <item>
+          <div slot="name" class="font-color">业务协办</div>
           <input
             slot="content" v-model="baseInfo.zm_approver_bp_n" placeholder="请选择"
             readonly
@@ -679,7 +684,7 @@
         <!--          <input slot="content" v-model="info.product_code" readonly />-->
         <!--        </item>-->
         <item >
-          <img @click="deleteProduct(item)" src="../../assets/contractCreate/delete.png" style="padding-left: 10px;margin-top: 12px;height: 20px;"/>
+          <img src="../../assets/contractCreate/delete.png" style="padding-left: 10px;margin-top: 12px;height: 20px;" @click="deleteProduct(item)">
           <div slot="name" class="font-color">产品名称</div>
           <input slot="content" v-model="item.ref_v02" readonly @click="saveProduct(item)">
         </item>
@@ -823,24 +828,24 @@ export default {
       debugger
       console.log('newVal' + newVal)
       if (this.quotationInfo.deposit_ratio) {
-        this.quotationInfo.deposit = newVal * this.quotationInfo.deposit_ratio/100
+        this.quotationInfo.deposit = newVal * this.quotationInfo.deposit_ratio / 100
       }
       if (this.quotationInfo.lease_charge_ratio) {
-        this.quotationInfo.lease_charge = newVal * this.quotationInfo.lease_charge_ratio/100
+        this.quotationInfo.lease_charge = newVal * this.quotationInfo.lease_charge_ratio / 100
       }
     },
     'quotationInfo.deposit_ratio' (newVal, oldVal) {
       debugger
       console.log('newVal' + newVal)
       if (this.quotationInfo.equip_price) {
-        this.quotationInfo.deposit = this.quotationInfo.equip_price * newVal/100
+        this.quotationInfo.deposit = this.quotationInfo.equip_price * newVal / 100
       }
     },
     'quotationInfo.lease_charge_ratio' (newVal, oldVal) {
       debugger
       console.log('newVal' + newVal)
       if (this.quotationInfo.equip_price) {
-        this.quotationInfo.lease_charge = this.quotationInfo.equip_price * newVal/100
+        this.quotationInfo.lease_charge = this.quotationInfo.equip_price * newVal / 100
       }
     },
   },
@@ -890,7 +895,6 @@ export default {
     })
   },
   activated () {
-
   },
   mounted () {
     this.getBpTenantSelects()
@@ -899,14 +903,14 @@ export default {
     this.repayPeriod()
   },
   methods: {
-    //删除设备
+    // 删除设备
     deleteProduct (item) {
       let vm = this
       let url = $config.basePath + 'zm_prj_lease_item_delete'
       let param = {
         master: {
           lists: [{
-            'project_lease_item_id': item.project_lease_item_id
+            'project_lease_item_id': item.project_lease_item_id,
           }],
         },
       }
@@ -1135,6 +1139,18 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.baseInfo = res.lists[0]
+          setTimeout(function () {
+            if (!vm.baseInfo.bp_user_id_n) {
+              let nowBind = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id'))
+              vm.baseInfo.bp_user_id_n = nowBind.bp_name
+              vm.baseInfo.bp_user_id = nowBind.bp_id
+            }
+            if (!vm.baseInfo.zm_approver_bp_n) {
+              let checkApprover = vm.approverBpList.filter(item => item.code_name === '李燕')
+              vm.baseInfo.zm_approver_bp_n = checkApprover[0].code_name
+              vm.baseInfo.zm_approver_bp = checkApprover[0].code
+            }
+          }, 100)
         }
       })
     },

src/pages/contractSigning/contract-new.vue

@@ -103,7 +103,12 @@
     <h-content v-if="num === 0" class="business-condition">
       <list-item :item-height="44" class="second-part">
         <item>
-          <div slot="name" class="font-color">业务经办</div>
+          <div slot="name" class="font-color">业务主办</div>
+          <input
+            slot="content" v-model="baseInfo.bp_user_id_n" readonly>
+        </item>
+        <item>
+          <div slot="name" class="font-color">业务协办</div>
           <input
             slot="content" v-model="baseInfo.zm_approver_bp_n" placeholder="请选择"
             readonly
@@ -770,6 +775,9 @@ export default {
 
   },
   mounted () {
+    let nowBind = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id'))
+    this.baseInfo.bp_user_id_n = nowBind.bp_name
+    this.baseInfo.bp_user_id = nowBind.bp_id
     this.getBpTenantSelects()
     this.getInvoiceType()
     this.getTaxpayer()
@@ -917,6 +925,10 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.approverBpList = res.lists.map(item => {
+            if (item.bp_name === '李燕') {
+              vm.$set(vm.baseInfo, 'zm_approver_bp', item.bp_id)
+              vm.$set(vm.baseInfo, 'zm_approver_bp_n', item.bp_name)
+            }
             return {
               code: item.bp_id,
               code_name: item.bp_name,
@@ -1533,7 +1545,7 @@ export default {
       }
       master.user_phone = window.localStorage.user_phone
       // master.phone= window.localStorage.user_phone
-      master.project_id   = vm.project_id
+      master.project_id = vm.project_id
       let param = {
         master,
       }