财务单据增加转交

src/components/FinancialModule/FinancialDocuments.vue

@@ -72,7 +72,7 @@
     ._icon_btn i.edit{background-color: #00C6FF;font-size: 16px;}
     ._icon_btn i.edit:hover{background-color: #59daff}
     ._icon_btn i.edit:active{background-color: #00b8ec}
-    ._icon_btn i.icon-sousuo{background-color: #47BF8C;}
+    ._icon_btn i.icon-sousuo,.icon-zhuanhuan1{background-color: #47BF8C;}
     ._icon_btn i.icon-sousuo:hover{background-color: #66bb97}
     ._icon_btn i.icon-sousuo:active{background-color: #35ab79}
     ._icon_btn i.icon-ico_commodity_defaul{background-color: #F16C3C;}
@@ -551,12 +551,17 @@
                         <el-tooltip class="item"  effect="dark" :content="$t('fnc.zhuanjiao')"   placement="top">
                             <i v-if="msg.Conditon==3 && !BOSSBtn2" class="iconfont icon-zhuanjiao1" @click="zhuanBox = true,zhuanMsg.WorkFlowId = item.FrID"></i>
                         </el-tooltip>
+                        <el-tooltip  class="item" effect="dark" content="转交"  placement="top">
+                            <i v-if="msg.Conditon==7" class="iconfont icon-zhuanhuan1" @click="getExchange(item.FrID)"></i>
+                        </el-tooltip>
                         <el-tooltip  class="item" effect="dark" :content="$t('active.cl_zuofei')"  placement="top">
                             <i v-if="((msg.Conditon==1 ||msg.Conditon==7)  && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
                         </el-tooltip>
                          <el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1"  class="item" :content="$t('fnc.tzjyriqi')"  placement="top">
                             <i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng" @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate" ></i>
                         </el-tooltip>
+
+
                     </td>
                 </tr>
             </table>
@@ -660,6 +665,38 @@
                 <p class="boss_btn_tips">{{$t('ios.yjshzqbyjxqtcz')}}</p>
             </template>
         </el-dialog>
+
+        <el-dialog custom-class='w400' title="制单人转交" :visible.sync="zhuanjiaoBox" center>
+            <template>
+                <el-form label-width="100px">
+                    <el-form-item label="制单人转交：">
+                        <el-select
+                            v-model="zhuanjiaoMsg.CreateBy"
+                            filterable
+                            remote
+                            reserve-keyword
+                            :placeholder="$t('pub.pleaseImport')"
+                            :remote-method="remoteMethodEx"
+                            @change="$forceUpdate()"
+                            >
+                            <el-option
+                                v-for="item in searchList"
+                                :key="item.empId"
+                                :label="item.name"
+                                :value="item.empId">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span>
+                            </el-option>
+                        </el-select>
+
+                    </el-form-item>
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <button class="hollowFixedBtn" @click="zhuanjiaoBox=false">{{$t('pub.cancelBtn')}}</button>
+                    <button class="normalBtn" type="primary" @click="setExchange()">{{$t('pub.sureBtn')}}</button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -675,6 +712,13 @@ export default {
             showID:false,
             active:1,
             userId:0,
+            zhuanjiaoBox:false,
+            searchList:[],
+            //转交信息
+            zhuanjiaoMsg:{
+                CreateBy:'',
+                FrIDList:[]
+            },
             msg:{
                 pageIndex:1,
                 pageSize:6,
@@ -845,6 +889,40 @@ export default {
         this.AccountType_post_GetList();
     },
     methods:{
+        //转交
+        getExchange(FrID){
+            this.zhuanjiaoMsg.CreateBy = '';
+            this.zhuanjiaoMsg.FrIDList = [];
+            this.zhuanjiaoMsg.FrIDList.push(FrID);
+            this.zhuanjiaoBox = true;
+        },
+        //设置转交
+        setExchange(){
+            if(this.zhuanjiaoMsg.CreateBy==''){
+                this.Error('请选择转交人');
+                return;
+            }
+            this.apipost('Financial_post_SetFinanceCreateByCareOf',this.zhuanjiaoMsg,res=>{
+                if(res.data.resultCode==1){
+                    this.Success(res.data.message);
+                    this.zhuanjiaoBox = false;
+                    this.getPageList();
+                }else{
+                    this.Error(res.data.message);
+                }
+            },err=>{})
+        },
+        remoteMethodEx(query) {  //  转交人模糊查询
+            if (query !== ''||this.addShow) {
+                this.apipost("admin_Get_Chat_All_SelectEmpName",{ EmName:query },res => {
+                    if (res.data.resultCode == 1) {
+                        this.searchList = res.data.data;
+                    }
+                },err => {});
+            } else {
+                this.searchList = [];
+            }
+        },
         subBOSSBtnClick: function () {
             this.loading = true;
             if (this.bossLen && this.bossLen <= this.checkList.length) {

src/components/FinancialModule/RecPayQuery.vue

@@ -342,7 +342,7 @@
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                     <button class="hollowFixedBtn" @click="zhuanjiaoBox=false">{{$t('pub.cancelBtn')}}</button>
-                    <button class="normalBtn" type="primary" @click="setExchange()">{{$t('pub.saveBtn')}}</button>
+                    <button class="normalBtn" type="primary" @click="setExchange()">{{$t('pub.sureBtn')}}</button>
                 </div>
             </template>
         </el-dialog>

src/components/Ticketing/TicketAmiba.vue

@@ -45,8 +45,8 @@
       </ul>
     </div>
     <div class="TA_Tongji">
-        <span>总成本：<span class="TA_TotalCost">{{TotalCost}}</span></span>
         <span>总收入：<span class="TA_GreenSale">{{TotalSale}}</span></span>
+        <span>总成本：<span class="TA_TotalCost">{{TotalCost}}</span></span>
         <span>总利润：<span class="TA_GreenSale">{{TotalProfit}}</span></span>
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading" style="margin-bottom:30px;">