Merge pull request 'master-dev' (#63) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/63

src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue

@@ -53,7 +53,7 @@
                       </el-radio-group>
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="24" v-if="!readOnly">
                     <el-row>
                        <el-col :span="3">
                         <el-button size="mini" type="primary" @click="append">自定义</el-button>
@@ -458,6 +458,9 @@ import { data } from "jquery";
       },
       // 双击节点
       handleDoubleClick(node,data){
+        if(this.readOnly){
+          return;
+        }
         data.inputeFlag = true;
       },
       // 拖拽 放下

src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue

@@ -152,7 +152,7 @@
           if(key==null && val==null){
             this.defaultItems=[...this.optionItems]
           }else{
-            this.onChange();
+            // this.onChange();
           }
         });
       },

src/views/emis/emisSettleBill/CustSettleBillQueryList.vue

@@ -771,12 +771,12 @@ export default {
           return v['sendName']+'--'+v['receiveName'];
         }
         if (j === 'custName') {
-          let paymentType=v['paymentType'];
-          if(paymentType==2 || paymentType==4 || paymentType==5 ){
+          // let paymentType=v['paymentType'];
+          // if(paymentType==2 || paymentType==4 || paymentType==5 ){
             return v['custName'];
-          }else{
-            return "";
-          }
+          // }else{
+          //   return "";
+          // }
         }
 
         if (j === 'sendMobile') {

src/views/emis/emisWaybill/waybillModify.vue

@@ -1882,10 +1882,10 @@ methods: {
     }
     this.form.sendSiteCode=item.siteCode;
     this.form.sendSiteName=item.siteName;
-    if(this.sendSiteSelectCount > 2){
+    // if(this.sendSiteSelectCount > 2){
       this.form.startSiteCode = item.siteCode;
       this.form.startSiteName = item.siteName;
-    }
+    // }
     this.initGetTotalAvailablePag(this.form.sendSiteCode);
     // this.calcBillFee();
   },