Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/addFinancialDocuments.vue

@@ -320,12 +320,12 @@
                             <td height="26px">
                                 <input v-model="da.UnitPrice"  type="text" @keydown="handleInput2" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input>
                             </td> -->
-                            <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)"  @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
+                            <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" :disabled="daIn === 0 && XSTC" type="text" @blur="addList(2,daIn+1)"  @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
                             <td height="26px">
-                                <el-input v-model="da.UnitPrice"  type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
+                                <el-input v-model="da.UnitPrice"  type="text" :disabled="((msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK) || (daIn === 0 && XSTC)" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
                             </td>
                             <td height="26px">
-                                <el-select  filterable :disabled="detailCurrDis" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
+                                <el-select  filterable :disabled="detailCurrDis || (daIn === 0 && XSTC)" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
                                     <el-option v-for='item in coinGetList'
                                         :label='item.Name'
                                         :value='item.ID'
@@ -662,6 +662,7 @@ export default {
             ZhuiJiaTK: false,
             SelectDisablsed:0,
             SelectState:false,
+            XSTC: false,
         }
     },
     methods:{
@@ -1264,6 +1265,7 @@ export default {
                         this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
                         this.detailList.Number = this.orderObj.CostType ? 1 : 0
                         this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType:0;
+                        this.XSTC = this.orderObj.XSTC ? true : false
                         if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
                             this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                         }

src/components/Login.vue

@@ -235,7 +235,7 @@ export default {
     initData() {
       //判断是否是线上环境
       if (!this.isOnline()) {
-        this.userInfo.name = "18117845617";
+        this.userInfo.name = "17602887190";
         this.userInfo.password = "123456";
       }
           this.userInfo.Domain =window.location.hostname

src/components/administrative/CommissionDetail.vue

@@ -58,7 +58,9 @@ export default {
       CompanyList:[],
       dataListTwo: [],
       stringPerons:'',
-      userInfo: {}
+      userInfo: {},
+      companyID: '',
+      disabledCPSelect: false
     };
   },
   methods: {
@@ -133,7 +135,6 @@ export default {
             data.forEach(x => {
               x.disabled = false;
             });
-            
             if(this.userInfo.RB_Branch_id!=0){
               this.CompanyList = data.filter(x=>{
                 if(x.BName==this.userInfo.BranchName){
@@ -161,7 +162,18 @@ export default {
         item.value = x.BName;
         companyList.push(item);
       });
-      let company = {
+      let company = {}
+      if(this.disabledCPSelect) {
+        company = {
+          field: "bName",
+          title: "公司",
+          width: 40,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true,
+        };
+      } else {
+        company = {
           field: "bName",
           title: "公司",
           width: 40,
@@ -172,13 +184,8 @@ export default {
           filterMultiple: false,
           filters: companyList,
           type: "select"
-        // filterMultiple: false,
-        // filters: companyList,
-        // result: "",
-        // type: "select",
-        // orderBy: "asc"
-        // isFrozen:true
         };
+      }
       let department = {
         field: "departmentName",
         title: "部门",
@@ -293,13 +300,13 @@ export default {
       };
       let remark = {
         field: "remark",
-        title: "备注",
+        title: "销售留言",
         titleAlign: "left",
         columnAlign: "left",
         isResize: true,
         width: 80,
         formatter: function(rowData, rowIndex, pagingIndex, field) {
-          return ``;
+          return rowData.remark ? rowData.remark : ''
         }
       };
       let opera = {
@@ -415,6 +422,11 @@ export default {
   mounted() {
     this.msg.pageSize = 10000; //不分页
     this.msg.ParentId = this.$route.query.ParentId;
+    if(this.$route.query.companyID) {
+      this.companyID = this.$route.query.companyID;
+      this.msg.RB_Branch_Id = this.$route.query.companyID;
+      this.disabledCPSelect = true
+    }
     let dt=new Date()
     this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth());
     this.userInfo = this.getLocalStorage();

src/components/administrative/CommissionManagement.vue

@@ -61,7 +61,7 @@
             <el-button
               type="primary"
               class="CM_look"
-              @click="generalFinancacls"
+              @click="generalFinancacls(item.branchMoney)"
               icon="el-icon-plus"
               title="制单"
               circle
@@ -169,12 +169,19 @@ export default {
         null
       );
     },
-    generalFinancacls(){
+    generalFinancacls(money){
+      let obj = {
+        CostType: 16,
+        Money: money,
+        CurrencyId: 1,
+        XSTC: 1,
+      }
       let query = {
         blank: "y",
         tab: "新增付款单据",
         Type:2,
-        IsUploadPic:1
+        IsUploadPic:1,
+        orderObj: JSON.stringify(obj)
       }
       if(this.userInfo.RB_Branch_id==0) {
         query.id=28

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -180,11 +180,13 @@
           <span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
         </td>
         <td>{{item.CreateDate}}</td>
-        <td><div v-for="childItem in item.TradeWayList">
+        <td>
+          <div v-for="childItem in item.TradeWayList">
             支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
             <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
             <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
-            </div></td>
+          </div>
+        </td>
         <td>
           <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
         </td>
@@ -237,11 +239,13 @@
           <span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
         </td>
         <td>{{item.CreateDate}}</td>
-        <td><div v-for="childItem in item.TradeWayList">
+        <td>
+          <div v-for="childItem in item.TradeWayList">
             支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
             <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
             <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
-            </div></td>
+          </div>
+        </td>
         <td>
           <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
         </td>
@@ -272,8 +276,8 @@
     <p class="teamRevenueExpenditureTitle">
       其它
       <span class="fr" style="margin-top: -8px;">
-        <input type="button" class="normalBtn" value="新增付款" @click="goUrl(14,2)" /><input type="button" class="normalBtn"
-          value="新增收款" @click="goUrl(14,1)" />
+        <input type="button" class="normalBtn" value="新增付款" @click="goUrl(14,2)" /><input type="button"
+          class="normalBtn" value="新增收款" @click="goUrl(14,1)" />
       </span>
     </p>
     <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
@@ -295,11 +299,13 @@
           <span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
         </td>
         <td>{{item.CreateDate}}</td>
-        <td><div v-for="childItem in item.TradeWayList">
+        <td>
+          <div v-for="childItem in item.TradeWayList">
             支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
             <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
             <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
-            </div></td>
+          </div>
+        </td>
         <td>
           <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
         </td>
@@ -352,13 +358,12 @@
         eatPay: 0,
         ticketPay: 0,
         busPay: 0,
-        otherPay:0,
+        otherPay: 0,
       }
     },
     methods: {
       //跳转到财务页面 
-	  goFinaceURL(id)
-	  {
+      goFinaceURL(id) {
         this.$router.push({
           name: 'FinancialDocumentsDetail',
           query: {
@@ -366,7 +371,6 @@
             'blank': 'y',
           }
         });
-          //http://www.test.com:8080/#/FinancialDocumentsDetail?id=2043
       },
       numberToWord(val) {
         switch (val) {
@@ -456,7 +460,7 @@
           SourceID: this.$route.query.id,
           TCIDList: TCIDARR
         }
-        id=id.length>0?JSON.stringify(id):null;
+        id = id.length > 0 ? JSON.stringify(id) : null;
         this.$router.push({
           name: 'ChoiceAddFinancialDocuments',
           query: {