update

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

@@ -121,7 +121,7 @@
             </div>
         </div>
         <!-- 电商商品 -->
-        <div v-if="OtherType==9 && ECommerceGoodsModel.Id>0">
+        <div v-if="OtherType==9 && ECommerceGoodsModel.Id>0 && LeaderState">
            <div class="_tit">
                 <span class="_text">电商商品</span>
                 <div>
@@ -129,7 +129,7 @@
                     <span class="_btn" v-else @click="tableShow3=true">展开 <i class="iconfont icon-gengduo"></i> </span>
                 </div>
             </div>
-            <div v-show="tableShow2" class="sanjiao-box _padding_20_15">
+            <div v-show="tableShow3" class="sanjiao-box _padding_20_15">
                 <table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
                     <tr>
                         <th width="50">编号</th>
@@ -187,7 +187,7 @@ export default {
             this.loading = false
             if (res.data.resultCode == 1) {
                 let data=res.data.data;
-                console.log("data",data)
+                // console.log("data",data)
                 this.LeaderRefundDetailList=data.LeaderRefundDetailList;
                 this.LeaderState=true;
                 this.OtherType=data.OtherType;

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1603,7 +1603,9 @@ export default {
         }else{
             if(this.$route.query.czmsg){
                 this.czmsg = JSON.parse(this.$route.query.czmsg);
-                this.czmsgState=true;
+                if(this.czmsg.Rate){
+                    this.czmsgState=true;
+                }
             }
             this.msg.TemplateId = this.$route.query.id;
             if(this.$route.query.id==90 || this.$route.query.id==91){

src/components/SalesModule/ElectricityGoods.vue

 
 <template>
-  <div class="Feedback">
+  <div class="Feedback ElectricityGoods">
       <ul style="overflow: initial!important">
          <li>
           <span>
@@ -26,36 +26,35 @@
       </ul>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
-        <th width="200">名称</th>
-        <th>制单收入</th>
-        <th>实收</th>
-        <th>平台税金</th>
-        <th>退款</th>
-        <th>成本</th>
-        <th>操作人/时间</th>
+        <th>名称</th>
+        <th width="100">制单收入</th>
+        <th width="100">实收</th>
+        <th width="100">平台税金</th>
+        <th width="100">退款</th>
+        <th width="100">成本</th>
         <th>描述</th>
-        <th v-if="unEdit">操作</th>
+        <th>操作人/时间</th>
+        <th  width="250" v-if="unEdit">操作</th>
       </tr>
         <tr v-for="(com,i) in dataList" :key="i">
             <td>{{com.Name}}</td>
-            <td>
-                <span @click="Gourl(com)" style="text-decoration: underline;">{{com.PreferPrice}}</span>
-            </td>
-            <td>{{com.Income}}</td>
-            <td>{{com.PlatformTax}}</td>
-            <td>{{com.Refund}}</td>
-            <td>{{com.Cost}}</td>
+            <td><span @click="Gourl(com)" style="text-decoration: underline;">{{com.PreferPrice}}</span></td>
+            <td><span @click="Gourl(com)" style="text-decoration: underline;">{{com.Income}}</span></td>
+            <td><span @click="Gourl(com)" style="text-decoration: underline;">{{com.PlatformTax}}</span></td>
+            <td><span @click="Gourl(com)" style="text-decoration: underline;">{{com.Refund}}</span></td>
+            <td><span @click="Gourl(com)" style="text-decoration: underline;">{{com.Cost}}</span></td>
+            <td>{{com.Description}}</td>
             <td>
                 <p>{{com.UpdateByName}}</p>
                 <p>{{com.UpdateTime}}</p>
             </td>
-            <td>{{com.Description}}</td>
+            
             <td v-if="unEdit">
                 <el-button v-if="userInfo.EmployeeId==com.UpdateBy" @click="SetRules(com)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
                 <el-button v-if="com.PreferPrice==0 && com.Income==0 &&com.PlatformTax==0 &&com.Refund==0 &&com.Cost==0" @click="Delete(com)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
                 <el-select style="width:100px" size="mini" @change="changeTypeValue(com,typeValue)" v-model="typeValue" placeholder="收款方式">
                     <el-option label="收款" :value="1"></el-option>
-                    <el-option label="付款" :value="2"></el-option>
+                    <el-option label="退款" :value="2"></el-option>
                     <el-option label="成本" :value="3"></el-option>
                 </el-select>
             </td>
@@ -79,14 +78,14 @@
     <el-dialog
         title="商品"
         :visible.sync="ruleVisible"
-        width="500px">
+        width="450px">
         <el-form ref="form" :model="form" :rules="rules" label-width="100px">
           
             <el-form-item label="名称" prop="Name">
-               <el-input class='w200' v-model='form.Name'></el-input>
+               <el-input class='w220' v-model='form.Name'></el-input>
             </el-form-item>
             <el-form-item label="描述" prop="Description">
-                <el-input
+                <el-input class='w220'
                     type="textarea"
                     :rows="2"
                     placeholder="请输入内容"
@@ -177,6 +176,7 @@ export default {
                 })
                 window.open(routeData.href, '_blank')
             }
+            this.typeValue="";
         },
         Gourl(com){
             this.$router.push({
@@ -267,6 +267,9 @@ export default {
 		
 </script>
 <style>
+.ElectricityGoods .singeRowTable tr td span{
+    cursor: pointer;
+} 
 .Feedback ul>li{
     display: inline-block;
     font-size: 12px;

src/components/SalesModule/ElectricityGoodsDetails.vue

@@ -91,9 +91,9 @@
           
         </ul>
         <ul class="clearfix">
-            <li><span>平台税金</span>{{staInfo.PlatformTax}}</li>
+            <li><span>平台税金：</span>{{staInfo.PlatformTax}}</li>
             <li><span>退款：</span>{{staInfo.Refund}}</li>
-            <li><span>成本:</span><span>{{staInfo.Cost}}</span></li>
+            <li><span>成本：</span><span>{{staInfo.Cost}}</span></li>
         </ul>
         
       </div>
@@ -326,7 +326,7 @@ export default {
       this.msg.Type = type;
       this.loading = true;
       this.apipost('Financial_get_GetECommerceGoodsFinancePageList', this.msg, res=>{
-        this.loading = false;
+        
         if (res.data.resultCode == 1) {
           let data = res.data.data.pageData;
           if (type===1) {
@@ -339,6 +339,7 @@ export default {
             this.dataList = data;
             this.getList(2)
           } else {
+            this.loading = false;
             this.allMoneyP = 0;
             this.shiMoneyP = 0;
             data.forEach(x=>{
@@ -351,6 +352,7 @@ export default {
             
           }
         } else {
+          this.loading = false;
           this.$message.error(res.data.message);
         }
       }, null)