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

src/assets/common/lang/EN/fill.js

@@ -275,7 +275,8 @@ export const obj = {
     dijieyuzhikuan: 'Receive advances',
     dianshanjieshuan: 'E-commerce settlement',
     yuanbiheji: 'total original yuan',
-    peizhishoupeifei: 'Set hand distribution fee',
+    Peizhishoupeifei: 'Manual configuration fee switch',
+    Dianfuduixiangtips: 'Internal employees prioritize payment to third-party companies, here is the selection of payment recipients for third-party companies',
     bangdaishou: 'collect',
     bangdaifu: 'Pay for it',
     degongsi:' The company',

src/assets/common/lang/Japan/fill.js

@@ -275,7 +275,8 @@ export const obj = {
   dijieyuzhikuan: '地接前借り金',
   dianshanjieshuan: ' eコマース決済',
   yuanbiheji: '元幣合計',
-  peizhishoupeifei: '私はあなたを愛します',
+  peizhishoupeifei: '手配り費スイッチ',
+dianfuduixiangtips:'内部従業員が第三者会社の支払先として選択した第三者会社の代金を優先的に代納します',
   bangdaishou: '代わりに受け取ります',
   bangdaifu: '肩代わり',
   degongsi: '会社',

src/assets/common/lang/zhCN/fill.js

@@ -275,7 +275,8 @@ export const obj = {
     dijieyuzhikuan: '地接预支款',
     dianshanjieshuan: '电商结算',
     yuanbiheji: '原币合计',
-    peizhishoupeifei: '配置手配费',
+    peizhishoupeifei: '手配费开关',
+    dianfuduixiangtips:'内部员工优先代付第三方公司款项，此处为第三方公司付款对象选择',
     bangdaishou: '帮代收',
     bangdaifu: '帮代付',
     degongsi:' 的公司',

src/assets/common/lang/zhTW/fill.js

@@ -275,7 +275,8 @@ export const obj = {
   dijieyuzhikuan: '地接預支款',
   dianshanjieshuan: '電商結算',
   yuanbiheji: '原幣合計',
-  peizhishoupeifei: '配置手配費',
+  peizhishoupeifei: '手配費開關',
+  dianfuduixiangtips:'內部員工優先代付協力廠商公司款項，此處為協力廠商公司付款對象選擇',
   bangdaishou: '幫代收',
   bangdaifu: '幫代付',
   degongsi:' 的公司',

src/components/FinancialModule/addFinancialDocuments.vue

@@ -763,8 +763,11 @@
 
               <p  style="margin-left: 15px;">
                 <span  class="el-select ">
-                  <el-checkbox v-model="KingdeeClientIDCheck"  @change="changeKingdeeClientID" :style="{'margin-top':KingdeeClientIDCheck?'0px':'6px'}">垫付对象</el-checkbox>
-                  <el-select v-if="KingdeeClientIDCheck"
+                  <el-tooltip  :content="$t('objFill.dianfuduixiangtips')"   placement="top">
+                    <el-checkbox v-model="KingdeeClientIDCheck"  @change="changeKingdeeClientID" :style="{'margin-top':KingdeeClientIDCheck?'0px':'6px'}">垫付对象</el-checkbox>
+                  </el-tooltip>
+                    <template v-if="KingdeeClientIDCheck">
+                  <el-select 
     v-model="msg.KingdeeClientID"  class="w135 _border_b_1"
     filterable
     remote
@@ -779,11 +782,13 @@
                                     <div>
                                       <span>{{`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`}}</span>
                                       <span style="margin-left: 15px;">
+                                        {{item.ID}}
                                         <el-tag size="mini" v-if="item.Status==1">{{$t('pub.fressSel')}}</el-tag>
                                       </span>
                                     </div>
                                 </el-option>
-  </el-select>
+                              
+  </el-select></template>
                 </span>
               </p>
             </div>
@@ -806,10 +811,12 @@
               </div>
               <!-- <p v-if="GetDetail.OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,4)" class="_jump_page _font_bold">机票收支</p> -->
             </template>
-            <el-tooltip :content="$t('objFill.peizhishoupeifei')" placement="top">
-              <el-switch v-if="isHandFee" v-model="is_HandFee" @change="getHandFee">
+            <template v-if="isHandFee"> 
+               <el-tooltip :content="$t('objFill.peizhishoupeifei')" placement="top">
+              <el-switch v-model="is_HandFee" @change="getHandFee" >
               </el-switch>
-            </el-tooltip>
+            </el-tooltip></template>
+
           </div>
 
           <template v-if="!BillSonName.includes('分摊')&&!BillSonName.includes('预付')">
@@ -1223,6 +1230,7 @@
         if(!this.KingdeeClientIDCheck){
           this.msg.KingdeeClientID='';
         }
+        console.log("this.msg.KingdeeClientID",this.msg.KingdeeClientID);
       },
       GetClientAccountListByKeyWord(query) {
         if (query !== '') {
@@ -1231,7 +1239,7 @@
                   Type: 0,
                   ObjID: 0,
                   CardNum: "",
-                  IsAll:true,
+                  IsAll:false,
                   KeyWord:query,
                 };
         this.apipost(
@@ -2400,7 +2408,6 @@
             this.$forceUpdate()
             this.editTemplateId = data.TemplateId;
             this.getCompany();
-
             data.IsLeader = 1;
             this.msg = JSON.parse(JSON.stringify(data));
             if(this.msg.KingdeeClientID>0){
@@ -2860,7 +2867,6 @@
       },
     },
     created() {
-
       var that = this;
       // crm自动登陆传过来的参数
       if (this.$route.query.crmOrderObj) {

src/components/ShoppingStore/ShoppingStore.vue

@@ -765,12 +765,23 @@
     </el-dialog>
 
     <el-dialog custom-class='w700' :title="$t('objFill.daoruyinxiaosj')" :visible.sync="outerVisible" center>
+      <div style="text-align:center; margin-bottom:5px;color:tomato;">通用购物店模板数据导入</div>
       <el-upload drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess"
         :before-upload="beforeAvatarUpload">
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">{{$t("tips.tuodongwenjian")}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
         <div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
       </el-upload>
+
+
+      <div style="text-align:center; margin-bottom:5px;color:tomato;">老板购物店模板数据导入</div>
+       <el-upload drag class="upload-demo" :action="importFileUrl3" :on-success="handleAvatarSuccess"
+        :before-upload="beforeAvatarUpload">
+        <i class="el-icon-upload"></i>
+          <div class="el-upload__text">{{$t("tips.tuodongwenjian")}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
+        <div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
+    
+      </el-upload> 
     </el-dialog>
   </div>
 </template>
@@ -792,6 +803,8 @@
         defaultImg: 'this.src="' + require("../../assets/img/shoppingstore.jpg") + '"',
         importFileUrl2: this.domainManager().UploadFileUrl +
           "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=1",
+          importFileUrl3: this.domainManager().UploadFileUrl +
+          "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=20&RB_Group_id=2&Type=20",
         downList: "",
         TotalPrice: "",
         GroupExtract: "",