Merge branch 'greenUrgent' into allTestUrgent

src/Form/commissionDistribution/add.vue

@@ -88,7 +88,7 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥ '+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'rewardamount'">
                     {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -100,10 +100,13 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+                  </div>
+                  <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else>
                     {{ scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation' ? scope.column.data[[scope.column.columnname]] : '--' }}

src/Form/contractManage/add.vue

@@ -10,7 +10,7 @@
         <el-dropdown-item command="经销项目">经销项目协议</el-dropdown-item>
         <el-dropdown-item command="直销项目">直销项目协议</el-dropdown-item>
         <el-dropdown-item command="工具借用">工具借用协议</el-dropdown-item>
-<!--        <el-dropdown-item command="居间">居间协议</el-dropdown-item>-->
+        <el-dropdown-item command="居间" v-if="siteid !== 'HY'">居间协议</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
     <el-drawer
@@ -36,6 +36,7 @@ export default {
   data () {
     return {
       drawer:false,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   computed: {

src/Form/salerExpenditure/add.vue

@@ -70,7 +70,7 @@
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'orderprice'">
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -97,10 +97,13 @@
                       {{scope.column.data[[scope.column.columnname]]?Math.round(tool.formatAmount(scope.column.data[[scope.column.columnname]]*100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+                    </div>
+                    <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else>
                       {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/Form/salerIncome/add.vue

@@ -65,7 +65,7 @@
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'rewardamount'">
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}

src/HDrpManagement/contractManage/components/priceDifference/addPriceDiff.vue

@@ -0,0 +1,326 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="addBtn(drawerFormVisible = true)">新 建</el-button>
+    <el-drawer
+        :title="title"
+        :visible.sync="drawerFormVisible"
+        size="700px"
+        direction="rtl"
+        append-to-body
+        :show-close="false"
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="10">
+          <el-form :model="form"  ref="form" :rules="rules" label-width="125px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="合同标题:" prop="title" :rules="{ required: true, message: '请填写合同标题', trigger: 'change' }">
+                <el-input v-model="form.title" placeholder="合同标题"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="居间商:" :rules="{ required: false, message: '请选择居间商', trigger: 'change' }">
+                <el-popover
+                    placement="bottom"
+                    trigger="manual"
+                    v-model="agentVisible"
+                    width="500">
+                  <selectAgentNew ref="member" type="22" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false" ></selectAgentNew>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="ascription.enterprisename" placeholder="请选择居间商" >
+                    <template slot="append">
+                      <el-button size="small" @click="agentVisible = false;ascription.enterprisename = '';agentListPrams.content.where.condition = '';$refs.member.selected = []" style="width:100%" type="primary">清空</el-button>
+                    </template>
+                  </el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="合同:" prop="ascription_contractid" :rules="{ required: true, message: '请输入合同', trigger: 'change' }">
+                <el-input v-model="ascription.ascription_title" placeholder="合同" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="项目名称:" prop="projectname">
+                <el-input v-model="ascription.projectname" placeholder="项目名称" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="项目编号:" prop="projectnum">
+                <el-input v-model="ascription.projectnum" placeholder="项目编号" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="客户名称:" prop="customername">
+                <el-input v-model="ascription.customername" placeholder="客户名称" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="业务员:" prop="saler_hrid" :rules="{ required: true, message: '请填写业务员', trigger: 'change' }">
+                <el-input v-model="ascription.salername" placeholder="业务员" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="签约日期:" prop="signdate" :rules="{ required: true, message: '请选择签约日期', trigger: 'change' }">
+                <el-input v-model="form.signdate" placeholder="签约日期" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="有效期:" prop="begdate" :rules="{ required: true, message: '请选择有效期', trigger: 'change' }">
+                <el-input v-model="ascription.expiration_date" placeholder="有效期" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="订单金额比例:" prop="orderratio" >
+                <el-input v-model="form.orderratio" placeholder="请填写比例，百分数%" ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="合同描述:" prop="remarks">
+                <el-input v-model="form.remarks" placeholder="请填写描述" ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button  size="small" @click="onClose" class="normal-btn-width inline-16" :disabled="loading">取 消</el-button>
+        <el-button size="small" type="primary" :loading="loading" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+    <el-dialog  :visible.sync="dialogTableVisible" append-to-body center width="70%">
+      <template slot="title">
+        <span style="float: left" >居间费调整确认</span>
+      </template>
+      <p style="color: red" class="mt-10">以下是居间费调整前后情况，若确认调整，系统自动将业务员提成重新计算并生成新的收入凭证</p>
+      <div class="mt-10">
+        <span>合计</span>
+        <span style="margin-left: 20px">调整前提成:<span style="color: red;margin-left: 10px">{{totalrewardamount == 0?'¥ '+tool.formatAmount(0,2):'¥ '+tool.formatAmount(totalrewardamount,2)}}</span></span>
+        <span style="margin-left: 20px">调整后提成:<span style="color: red;margin-left: 10px">{{totaladjustrewardamount == 0?'¥ '+tool.formatAmount(0,2):'¥ '+tool.formatAmount(totaladjustrewardamount,2)}}</span></span>
+        <span style="margin-left: 20px">差额:<span style="color: red;margin-left: 10px">{{totalsubamount == 0?'¥ '+tool.formatAmount(0,2):'¥ '+tool.formatAmount(totalsubamount,2)}}</span></span>
+      </div>
+      <table-detail :layout="adjustTable" :data="adjustList" :custom="true" :width="true" :height="tableHieght">
+        <template v-slot:customcol="scope" >
+          <div v-if="scope.column.columnname == 'rewardamount'">
+            {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'adjustrewardamount'" style="color: red">
+            {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+          </div>
+          <div v-else-if="scope.column.columnname == 'subamount'">
+            {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+          </div>
+          <div v-else>
+            {{ scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation' ? scope.column.data[[scope.column.columnname]] : '--' }}
+          </div>
+        </template>
+      </table-detail>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="adjustCancel" class="normal-btn-width" size="small" :disabled="adjustLoading" >取消</el-button>
+        <el-button type="primary" @click="adjustClick" class="normal-btn-width" size="small" :loading="adjustLoading">确定调整</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import selectAgentNew from '../selectAgentNew.vue'
+export default {
+  name: "addPriceDiff",
+  props:["data"],
+  components:{selectAgentNew},
+  data(){
+    return {
+      title:'新建居间协议',
+      drawerFormVisible:false,
+      dialogTableVisible:false,
+      agentVisible:false,
+      loading:false,
+      adjustLoading:false,
+      adjustCancle:false,
+      tableHieght:'calc(100vh - 580px)',
+      form:{
+        "sa_contractid": 0,//合同id
+        "sys_enterpriseid": "",//居间商id
+        "begdate": "",//有效期开始时间
+        "enddate": "",//有效期截止时间
+        "sa_projectid": "",//项目id选择项目合同时传
+        "type": "居间",
+        "saler_hrid": "",//业务员id
+        "signdate": "",//签约时间
+        "remarks": "",//备注
+        "title": "",//标题
+        "calculatemodel": "",
+        "orderratio": "",//订单金额比例
+        "ascription_contractid": "",//归属合同ID，关联合同ID
+        "billno": "",
+      },
+      ascription:{
+        "enterprisename":"",
+        "ascription_title":"",
+        "projectname":"",
+        "projectnum":"",
+        "customername":"",
+        "salername":"",
+        "expiration_date":""
+      },
+      agentListPrams: {
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": "",
+            "type":5,
+            "typemx":"",
+          }
+        }
+      },
+      rules:{
+        orderratio: [
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法，请输入数值',trigger: 'blur'},
+          { required: true, message: '请填写比例，百分数%', trigger: 'blur' },
+        ],
+      },
+      adjustParam:{
+        "id": 20240828165904,
+        "content": {
+          "sa_contractid": "0",
+          "orderratio": "",
+          "isadd": true, //新建时请求确认列表传true
+          "ascription_contractid": "",// 来源合同id
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        }
+      },
+      adjustList:[],
+      adjustTable:[],
+      adjustTotal:0,
+      adjustCurrentPage:0,
+      totalrewardamount:0,
+      totaladjustrewardamount:0,
+      totalsubamount:0,
+      sys_enterpriseid:''
+    }
+  },
+  methods:{
+    addBtn(){
+      this.form.title = this.data.enterprisename + '/' + this.data.title + '_居间费'
+      this.form.ascription_contractid = this.data.sa_contractid
+      this.form.sa_projectid = this.data.sa_projectid
+      this.form.saler_hrid = this.data.saler_hrid
+      this.form.begdate = this.data.begdate
+      this.form.enddate = this.data.enddate
+      this.form.signdate = this.data.signdate
+      this.ascription = {
+        "ascription_title":this.data.title,
+        "projectname":this.data.projectname,
+        "projectnum":this.data.projectnum,
+        "customername":this.data.enterprisename,
+        "salername":this.data.salername,
+        "expiration_date":this.data.begdate + '至' + this.data.enddate
+      }
+    },
+    editBtn(data){
+      this.title = '编辑居间协议'
+      this.form.title = data.title
+      this.form.sa_contractid = data.sa_contractid
+      this.form.sys_enterpriseid = data.sys_enterpriseid == -1 ? '':data.sys_enterpriseid
+      this.form.orderratio = Math.round((data.orderratio * 100)*100)/100
+      this.form.ascription_contractid = this.data.sa_contractid
+      this.form.sa_projectid = this.data.sa_projectid
+      this.form.saler_hrid = this.data.saler_hrid
+      this.form.begdate = this.data.begdate
+      this.form.enddate = this.data.enddate
+      this.form.signdate = this.data.signdate
+      this.ascription = {
+        "ascription_title":this.data.title,
+        "enterprisename":data.sys_enterpriseid == -1  ? '':data.enterprisename,
+        "projectname":this.data.projectname,
+        "projectnum":this.data.projectnum,
+        "customername":this.data.enterprisename,
+        "salername":this.data.salername,
+        "expiration_date":this.data.begdate + '至' + this.data.enddate
+      }
+    },
+    onSubmit(){
+      this.$refs.form.validate(async (valid)=>{
+        this.loading = true
+        if (!valid) return false
+        this.form.orderratio = (this.form.orderratio / 100).toFixed(4)
+        let res = await this.$api.requested({
+          "id": 20221121185302,
+          "content": this.form
+        })
+        if (res.code == 0){
+          this.form.orderratio = this.form.orderratio * 100
+          this.loading = false
+        }else {
+          this.dialogTableVisible = true
+          this.onAdjust(res.data)
+        }
+      })
+    },
+    async onAdjust(data){
+      this.adjustParam.content.sa_contractid = data.sa_contractid
+      this.adjustParam.content.orderratio = data.orderratio
+      this.adjustParam.content.ascription_contractid = data.ascription_contractid
+      this.sys_enterpriseid = this.form.sys_enterpriseid?this.form.sys_enterpriseid:data.sys_enterpriseid
+      const res = await this.$api.requested(this.adjustParam)
+      this.adjustList = res.data
+      this.adjustTotal = res.total
+      this.adjustCurrentPage = res.pageNumber
+      this.totaladjustrewardamount = res.data[0].totaladjustrewardamount
+      this.totalrewardamount = res.data[0].totalrewardamount
+      this.totalsubamount = res.data[0].totalsubamount
+    },
+    showChange(){
+      this.agentVisible = true
+      this.$refs.member.listData(this.$refs.member.param.content.pageNumber = 1)
+    },
+    centerChange (data) {
+      this.ascription.enterprisename = data[0].enterprisename
+      this.form.sys_enterpriseid = data[0].sys_enterpriseid
+      this.agentVisible = false
+    },
+    onClose(){
+      this.drawerFormVisible = false
+      this.form.orderratio = ''
+      this.$refs.form.resetFields()
+      this.form.remarks = ''
+    },
+    async adjustClick(){
+      this.adjustLoading = true
+      const res = await this.$api.requested({
+        "id": "20240828163204",
+        "content": {
+          "sa_contractid": this.adjustParam.content.sa_contractid,
+          "orderratio": this.adjustParam.content.orderratio,
+          "sys_enterpriseid":this.sys_enterpriseid,
+          "remarks":""
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.adjustLoading = false
+        this.loading = false
+        this.drawerFormVisible = false
+        this.dialogTableVisible = false
+        this.$emit('adjustSuccess')
+      })
+    },
+    adjustCancel(){
+      this.adjustLoading = false
+      this.loading = false
+      this.dialogTableVisible = false
+    }
+  },
+  created() {
+    this.adjustTable = this.tool.tabelCol(this.$route.name).adjustTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/contractManage/components/priceDifference/index.vue

@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <el-input style="width:200px;" placeholder="输入搜索内容" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="mt-10 input-with-select inline-16 layout_search__panel" clearable>
+    </el-input>
+    <addPriceDiff ref="priceDiff" class="inline-16" :data="data" @adjustSuccess="adjustSuccess"></addPriceDiff>
+    <table-detail  :layout="tablecols" :data="list" :custom="true" :width="true" :height="tableHieght">
+      <template v-slot:customcol="scope" >
+        <div v-if="scope.column.columnname == 'orderratio'">
+          {{scope.column.data[[scope.column.columnname]]?Math.round((scope.column.data[[scope.column.columnname]] * 100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}
+        </div>
+        <div v-else-if="scope.column.columnname == 'amount'">
+          {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+        </div>
+        <div v-else-if="scope.column.columnname == 'rebate'" style="color: red">
+          {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+        </div>
+        <div v-else>
+          {{ scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation' ? scope.column.data[[scope.column.columnname]] : '--' }}
+        </div>
+      </template>
+      <template v-slot:opreation="scope">
+        <el-button type="text" @click="adjustClick(scope.data)" size="mini">调整</el-button>
+        <el-button type="text" size="mini" @click="goDetail(scope.data)">详情</el-button>
+      </template>
+    </table-detail>
+    <div  class="container normal-panel" style="text-align:right;padding-bottom: 0!important;">
+      <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[50, 100, 150, 200]"
+          :page-size="50"
+          layout="total,sizes, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import addPriceDiff from "./addPriceDiff"
+export default {
+  name: "index",
+  props:["data"],
+  components:{addPriceDiff},
+  data(){
+    return {
+      tableHieght:'calc(100vh - 380px)',
+      tablecols:[],
+      list:[],
+      currentPage:0,
+      total:0,
+      pageTotal:0,
+      listqueryid:'',
+      param:{
+        "id": 20240829103004,
+        "content": {
+          "sa_contractid": "",
+          "pageNumber": 1,
+          "pageSize": 50,
+          "where": {
+            "condition": ""
+          }
+        }
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      this.param.content.sa_contractid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
+      sessionStorage.setItem('total',res.total)
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    adjustClick(data){
+      this.$refs.priceDiff.drawerFormVisible = true
+      this.$refs.priceDiff.editBtn(data)
+    },
+    adjustSuccess(){
+      this.listData(this.param.content.pageNumner = 1)
+      this.$emit('adjustSuccess')
+    },
+    goDetail(data){
+      sessionStorage.setItem('listqueryid',this.listqueryid)
+      sessionStorage.setItem('rowindexOld',data.rowindex)
+      sessionStorage.setItem('listqueryidOld',this.$route.query.listqueryid)
+      sessionStorage.setItem('contractId',this.$route.query.id)
+      sessionStorage.setItem('typeOld',this.$route.query.type)
+      sessionStorage.setItem('totalOld',this.total)
+      sessionStorage.setItem('total',this.total)
+      sessionStorage.setItem('isGo','1')
+      this.$store.dispatch('changeDetailDrawer',false)
+      setTimeout(()=>{
+        this.$router.push({path:'/contractDetail',
+          query:{
+            id:data.sa_contractid,
+            rowindex:data.rowindex,
+            listqueryid:this.listqueryid,
+            type:'居间',
+            fieldname:'sa_contract'
+          }})
+        this.$store.dispatch('changeDetailDrawer',true)
+      },500)
+    }
+  },
+  mounted() {
+    this.listData()
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).priceDifferenceTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/contractManage/components/reverseCheck.vue

@@ -1,14 +1,20 @@
 <template>
+  <div>
     <el-button size="mini" @click="submit" type="primary">反 审 核 </el-button>
+    <adjust v-show="false" ref="adjustRef" @adjustSuccess="onCheck"></adjust>
+  </div>
 </template>
 
 <script>
+import adjust from '../components/priceDifference/index'
 export default {
   props:['data'],
   name: '',
+  components:{adjust},
   data() {
     return {
-      checkVisible:false
+      checkVisible:false,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   computed:{
@@ -22,18 +28,26 @@ export default {
       this.$confirm('确定反审核当前合同吗？','提示',{
         confirmButtonText:'确定',
         cancelButtonText:'取消'
-      }).then(async () => {
-        let res = await this.$api.requested({
-          "id": 20221212135402,
-          "content": {
-              "sa_contractid": this.data.sa_contractid
-          },
-        })
-        this.tool.showMessage(res,() => {
-          this.$emit('onSuccess')
-        })
+      }).then(() => {
+        if (this.siteid == 'HY' && this.$route.query.type == '居间'){
+          this.$refs.adjustRef.$refs.priceDiff.dialogTableVisible = true
+          this.$refs.adjustRef.$refs.priceDiff.onAdjust(this.data)
+        }else {
+          this.onCheck()
+        }
       })
     },
+    async onCheck(){
+      let res = await this.$api.requested({
+        "id": 20221212135402,
+        "content": {
+          "sa_contractid": this.data.sa_contractid
+        },
+      })
+      this.tool.showMessage(res,() => {
+        this.$emit('onSuccess')
+      })
+    }
   },
 };
 </script>

src/HDrpManagement/contractManage/components/submitCheck.vue

@@ -2,17 +2,21 @@
   <div >
     <el-button  @click="submit" size="mini" slot="reference" type="primary" :disabled="data.status == '已过期'" v-if="data.status=='新建' && tool.checkAuth($route.name,'submit') && !disabled && data.status">提 交</el-button>
     <el-button @click="submit" size="mini" slot="reference" type="primary" v-if="data.status=='已提交' && tool.checkAuth($route.name,'check') && data.status">审 核</el-button>
+    <adjust v-show="false" ref="adjustRef" @adjustSuccess="onCheck"></adjust>
   </div>
 </template>
 
 <script>
+import adjust from '../components/priceDifference/index'
 export default {
   props:['data','disabled'],
   name: '',
+  components:{adjust},
   data() {
     return {
       checkVisible:false,
-      refresh:true
+      refresh:true,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   computed:{
@@ -21,7 +25,7 @@ export default {
 
   },
   created() {
-    console.log('eeee',this.disabled);
+
   },
   methods: {
     submit () {
@@ -41,45 +45,45 @@ export default {
           })
         })
       } else {
-        console.log(this.data,'审核数据')
-        console.log(new Date(this.data.enddate))
-        console.log(new Date())
-        console.log(new Date() > new Date(this.data.enddate))
         if (new Date() > new Date(this.data.enddate)){
           this.$confirm('当前合同有效期已过期，是否确定继续审核？','提示',{
             confirmButtonText:'确定',
             cancelButtonText:'取消'
-          }).then(async () => {
-            let res = await this.$api.requested({
-              "id": 20221121203102,
-              "content": {
-                "type":1,//0：不通过，1：通过
-                "sa_contractid": this.data.sa_contractid
-              },
-            })
-            this.tool.showMessage(res,() => {
-              this.$emit('onSuccess')
-            })
+          }).then( () => {
+            if (this.siteid == 'HY' && this.$route.query.type == '居间'){
+              this.$refs.adjustRef.$refs.priceDiff.dialogTableVisible = true
+              this.$refs.adjustRef.$refs.priceDiff.onAdjust(this.data)
+            }else {
+              this.onCheck()
+            }
           })
         }else {
           this.$confirm('确定进行审核操作吗？','提示',{
             confirmButtonText:'确定',
             cancelButtonText:'取消'
-          }).then(async () => {
-            let res = await this.$api.requested({
-              "id": 20221121203102,
-              "content": {
-                "type":1,//0：不通过，1：通过
-                "sa_contractid": this.data.sa_contractid
-              },
-            })
-            this.tool.showMessage(res,() => {
-              this.$emit('onSuccess')
-            })
+          }).then( () => {
+            if (this.siteid == 'HY' && this.$route.query.type == '居间'){
+              this.$refs.adjustRef.$refs.priceDiff.dialogTableVisible = true
+              this.$refs.adjustRef.$refs.priceDiff.onAdjust(this.data)
+            }else {
+              this.onCheck()
+            }
           })
         }
       }
     },
+    async onCheck(){
+      let res = await this.$api.requested({
+        "id": 20221121203102,
+        "content": {
+          "type":1,//0：不通过，1：通过
+          "sa_contractid": this.data.sa_contractid
+        },
+      })
+      this.tool.showMessage(res,() => {
+        this.$emit('onSuccess')
+      })
+    }
   },
 };
 </script>

src/HDrpManagement/contractManage/modules/detail.vue

@@ -9,8 +9,7 @@
         idname="sa_contractid"
         typeTask="合同"
         ownertable="sa_contract"
-        :tabs="mainData.type === '项目' ? ['产品明细折扣','产品类别折扣','详细信息'] : mainData.type === '框架' ? ['产品明细折扣','产品类别折扣','业绩目标','详细信息'] : mainData.type === '居间' ? ['产品明细折扣','产品类别折扣','详细信息'] : mainData.type === '直销' ? ['产品明细折扣','产品类别折扣','业绩目标','详细信息'] : ['工具清单','详细信息']"
-
+        :tabs="tabs"
         :statusCheck="[{key:'status',value:'已提交'},{key:'status',value:'审核'},{key:'status',value:'已终止'}]"
         @pageChange="pageChange"
         @onEditSuccess="editSuccess">
@@ -70,7 +69,7 @@
           </template>
         </productBillno>
         <!--产品明细折扣表-->
-        <productDetailList :data="mainData" :isLeader="isLeader" ref="productDetailList" v-if="mainData.type == '框架' || mainData.type == '直销' || mainData.type == '居间'"  @priceChange="queryMainData($route.query.id)" @closeDrawer="queryMainData($route.query.id)">
+        <productDetailList :data="mainData" :isLeader="isLeader" ref="productDetailList" v-if="mainData.type == '框架' || mainData.type == '直销' || (mainData.type == '居间' && siteid !== 'HY')"  @priceChange="queryMainData($route.query.id)" @closeDrawer="queryMainData($route.query.id)">
           <importFile
             v-if="tool.checkAuth($route.name,'exportProduct') && isLeader && mainData.status === '新建'"
             slot="export"
@@ -99,6 +98,8 @@
           <template v-slot:edit="scope">
           </template>
         </toolList>
+        <!--  详细信息      -->
+        <BaseInfo v-if="mainData.type === '居间' && siteid === 'HY'" :detailInfo="detailInfo"/>
       </div>
       <div slot="slot1" >
         <!--产品类别折扣表-->
@@ -150,15 +151,9 @@
             </el-dialog>
           </template>
         </itemClass>
-        <!--合同条款-->
-<!--        <contractClause :sys_enterpriseid="mainData.sys_enterpriseid" :disabled="mainData.status != '新建' || !isLeader" ref="Claus" v-if=" mainData.type == '工具借用'">
-        </contractClause>-->
         <BaseInfo v-if="mainData.type === '工具借用'" :detailInfo="detailInfo"/>
       </div>
       <div slot="slot2">
-        <!--合同条款-->
-<!--        <contractClause :sys_enterpriseid="mainData.sys_enterpriseid" :disabled="mainData.status != '新建' || !isLeader" ref="Claus" v-if="mainData.type == '项目' ">
-        </contractClause>-->
         <!--业绩目标-->
         <taskTarget ref="taskTarget" v-if="Object.keys(mainData).length > 0 && (mainData.type == '框架' || mainData.type == '直销')" :data="mainData">
           <template v-slot:addTarget="scope">
@@ -171,11 +166,27 @@
             <del-target @onSuccess="$refs.taskTarget.queryData()" class="inline-16" :disabled="mainData.status != '新建' || !isLeader" v-if="tool.checkAuth($route.name,'taskTargetManage')" :id="scope.data.sa_salestargetbillid"></del-target>
           </template>
         </taskTarget>
+        <div>
+          <!--   差价     -->
+          <priceDifference v-if="mainData.type == '项目' && siteid == 'HY' && tool.checkAuth($route.name,'brokerageFeeEntrySet')" :data="mainData"></priceDifference>
+
+          <!--   详细信息     -->
+          <BaseInfo v-else :detailInfo="detailInfo"/>
+        </div>
 
-        <BaseInfo v-if="mainData.type !== '框架' && mainData.type !== '直销'" :detailInfo="detailInfo"/>
+        <!--   详细信息     -->
+        <BaseInfo v-if="(mainData.type !== '框架' && mainData.type !== '直销' && mainData.type !== '项目')" :detailInfo="detailInfo"/>
       </div>
       <div slot="slot3">
-        <BaseInfo v-if="mainData.type !== '居间'" :detailInfo="detailInfo"/>
+        <BaseInfo v-if="mainData.type !== '居间' && mainData.type !== '框架' && mainData.type !== '直销' " :detailInfo="detailInfo"/>
+        <div>
+          <!--   差价     -->
+          <priceDifference v-if="(mainData.type == '框架' || mainData.type == '直销') && siteid == 'HY' && tool.checkAuth($route.name,'brokerageFeeEntrySet')" :data="mainData"></priceDifference>
+          <BaseInfo v-else :detailInfo="detailInfo"/>
+        </div>
+      </div>
+      <div slot="slot4">
+        <BaseInfo  :detailInfo="detailInfo"/>
       </div>
     </basicDetails>
   </div>
@@ -205,6 +216,7 @@ import BaseInfo from '@/HDrpManagement/projectChange/modules/modules/baseInfo/ba
 import itemClass from '../components/itemClass/index.vue'
 import importFile from '../components/importFile'
 import copyTo from '../components/copyTo'
+import priceDifference from '../components/priceDifference/index'
 import { Loading } from 'element-ui';
 export default {
   name: "detail",
@@ -221,7 +233,9 @@ export default {
       cooperateForm:{
         "sa_contractid": "",
         "isadd":''
-      }
+      },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
+      tabs:[]
     }
   },
   components:{
@@ -247,7 +261,8 @@ export default {
     revoke,
     itemClass,
     importFile,
-    copyTo
+    copyTo,
+    priceDifference
   },
   watch: {
     mainData: {
@@ -294,6 +309,24 @@ export default {
     }
   },
   methods:{
+    tabsSet(){
+      switch (this.mainData.type) {
+        case '项目':
+          this.tabs = this.siteid == 'HY'?this.tool.checkAuth(this.$route.name,'brokerageFeeEntrySet')?['产品明细折扣','产品类别折扣','差价','详细信息']:['产品明细折扣','产品类别折扣','详细信息']:['产品明细折扣','产品类别折扣','详细信息']
+              break
+        case '框架':
+          this.tabs = this.siteid == 'HY'?this.tool.checkAuth(this.$route.name,'brokerageFeeEntrySet')?['产品明细折扣','产品类别折扣','业绩目标','差价','详细信息']:['产品明细折扣','产品类别折扣','业绩目标','详细信息']:['产品明细折扣','产品类别折扣','业绩目标','详细信息']
+              break
+        case '居间':
+          this.tabs = this.siteid == 'HY'?['详细信息']:['产品明细折扣','产品类别折扣','详细信息']
+              break
+        case '直销':
+          this.tabs = this.siteid == 'HY'?this.tool.checkAuth(this.$route.name,'brokerageFeeEntrySet')?['产品明细折扣','产品类别折扣','业绩目标','差价','详细信息']:['产品明细折扣','产品类别折扣','业绩目标','详细信息']:['产品明细折扣','产品类别折扣','业绩目标','详细信息']
+              break
+        default:
+          this.tabs = ['工具清单','详细信息']
+      }
+    },
     editSuccess(){
       this.queryMainData(this.$route.query.id)
     },
@@ -317,6 +350,7 @@ export default {
           : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:this.mainData.type,tabIndex:this.$route.query.tabIndex,listqueryid:listqueryid,fieldname:'sa_contractid'}})
 
       this.changeDataStructure()
+      this.tabsSet()
     },
     changeDataStructure() {
       let that = this

src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -7,7 +7,7 @@
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="经销项目" >经销项目协议</el-dropdown-item>
         <el-dropdown-item command="直销项目" >直销项目协议</el-dropdown-item>
-<!--        <el-dropdown-item command="居间">居间协议</el-dropdown-item>-->
+        <el-dropdown-item command="居间" v-if="siteid !== 'HY'">居间协议</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
     <el-drawer
@@ -154,11 +154,6 @@
                 <el-input disabled type="text" size="small" v-model="form.projectnum" placeholder="请选择项目"></el-input>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="24">
-              <el-form-item label="项目地址:" prop="">
-                <el-input disabled type="text" size="small" v-model="address"></el-input>
-              </el-form-item>
-            </el-col>-->
             <el-col :span="24">
               <el-form-item label="业务员:" prop="">
                 <el-input disabled type="text" size="small" v-model="form.salername"></el-input>
@@ -186,23 +181,6 @@
                 <el-input type="text" size="small" v-model="form.reminddays" placeholder="请输入发货日期提醒天数"></el-input>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="24">
-              <el-form-item label="收货人:" prop="receiptName">
-                <el-popover
-                    placement="bottom"
-                    trigger="manual"
-                    v-model="receiptVisible"
-                    width="600">
-                  <seleteReceipt ref="receipt" type="1" @onSelect="receiptChange" @onCanel="receiptVisible = false"></seleteReceipt>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('receiptVisible')" v-model="form.receiptName"></el-input>
-                </el-popover>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="收货人电话:" prop="">
-                <el-input disabled type="text" size="small" v-model="form.phonenumber"></el-input>
-              </el-form-item>
-            </el-col>-->
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
@@ -497,6 +475,7 @@ export default {
           }
         }
       },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   computed: {

src/HDrpManagement/projectChange/modules/modules/contract/index.vue

@@ -151,7 +151,7 @@ export default {
                 rowindex:data.rowindex,
                 listqueryid:this.listqueryid,
                 type:type,
-                fieldname:'sa_contractid'
+                fieldname:'sa_contract'
               }})
             this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
             return

src/SDrpManagement/commissionDistribution/detail/components/income.vue

@@ -47,7 +47,7 @@
           {{scope.column.data[[scope.column.columnname]]?'¥ '+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
         <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'rewardamount'">
           {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -59,10 +59,13 @@
           {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+        </div>
+        <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'amount'">
           <div v-if="data.status != '发放' ">

src/SDrpManagement/commissionDistribution/detail/modules/addDetail.vue

@@ -86,7 +86,7 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥ '+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'rewardamount'">
                     {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -98,10 +98,13 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+                  </div>
+                  <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else>
                     {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/commissionDistribution/index.vue

@@ -56,7 +56,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
-          <span style="color: red">{{scope.data.column.data.amount?tool.formatAmount(scope.data.column.data.amount,2):scope.data.column.data.amount == 0?tool.formatAmount(0,2):'--'}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/SDrpManagement/myaccountclass/index.vue

@@ -40,7 +40,7 @@
               </el-input>
             </div>
           </template>
-          <tableMainLayout :layout="tablecols" :data="list" :opwidth="200" :width="true" :custom="true" :fixedName="'operation'" height="calc(100vh - 430px)">
+          <tableMainLayout :layout="siteid == 'HY' && usertype == '1'?tablecolsSale:tablecols" :data="list" :opwidth="200" :width="true" :custom="true" :fixedName="'operation'" height="calc(100vh - 430px)">
             <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname == 'type'">
                 {{ scope.column.data.type ? '收入' : '支出' }}
@@ -61,6 +61,12 @@
                   {{ scope.column.data[[scope.column.columnname]] ? scope.column.data[[scope.column.columnname]] : '--' }}
                 </span>
               </div>
+              <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+                {{scope.column.data[[scope.column.columnname]]?'¥ ' + tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ ' + '0.00':'¥ 0.00'}}
+              </div>
+              <div v-else-if="scope.column.columnname === 'amount'">
+                {{scope.column.data[[scope.column.columnname]]?'¥ ' + tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ ' + '0.00':'--'}}
+              </div>
               <div v-else>
                 {{ scope.column.data[[scope.column.columnname]] ? scope.column.data[[scope.column.columnname]] : '--' }}
               </div>
@@ -100,13 +106,15 @@
             <span style="font-size: 14px">{{checkDate}}</span>
           </div>-->
         </div>
-        <tableTemplate style="margin-top: 10px" ref="table" :layout="drawType?tablecolsIncome:tablecolsPay" :data="voucherList" :opwidth="200" :custom="true" height="calc(100vh - 170px)">
-          <template v-slot:customcol="scope">
+        <tableTemplate style="margin-top: 10px" ref="table" :layout="drawType?siteid == 'HY' && usertype == '1'?tablecolsIncomeSale:tablecolsIncome:siteid == 'HY' && usertype == '1'?tablecolsPaySale:tablecolsPay" :data="voucherList" :opwidth="200" :custom="true" height="calc(100vh - 170px)" :headerOptions="['orderamount']">
+          <template v-slot:header="scope" >
+          </template>
+          <template v-slot:customcol="scope" >
             <div v-if="scope.column.columnname === 'amount'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else-if="scope.column.columnname === 'orderprice'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -129,6 +137,9 @@
             <div v-else-if="scope.column.columnname === 'cashbilldetailamount'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
+            <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+            </div>
             <div v-else-if="scope.column.columnname === 'rate'">
               {{scope.column.data[[scope.column.columnname]]?Math.round(tool.formatAmount(scope.column.data[[scope.column.columnname]]*100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}
             </div>
@@ -138,6 +149,8 @@
             <div v-else>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
             </div>
+
+
           </template>
         </tableTemplate>
         <div  style="text-align:right;float: right;margin-top: 10px">
@@ -168,6 +181,7 @@ export default {
       activeName:0,
       acountlist:[],
       tablecols:[],
+      tablecolsSale:[],
       list:[],
       param: {
         "id":20230111103403,
@@ -212,11 +226,14 @@ export default {
       dateSelect:[],
       usertype:JSON.parse(sessionStorage.getItem('active_account')).usertype,
       hrid:JSON.parse(sessionStorage.getItem('active_account')).hrid,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       drawTitle:'',
       drawType:'',
       dialogVisible:false,
       tablecolsIncome:[],
       tablecolsPay:[],
+      tablecolsIncomeSale:[],
+      tablecolsPaySale:[],
       voucherList:[],
       voucherTotal:0,
       voucherCurrentPage:0,
@@ -338,6 +355,9 @@ export default {
     this.tablecols = this.tool.tabelCol(this.$route.name)['accountMoneyDetailTable'].tablecols
     this.tablecolsIncome = this.tool.tabelCol(this.$route.name)['incomeVoucherDetailsTable'].tablecols
     this.tablecolsPay = this.tool.tabelCol(this.$route.name)['payVoucherDetailsTable'].tablecols
+    this.tablecolsSale = this.tool.tabelCol(this.$route.name)['accountMoneySaleTable'].tablecols
+    this.tablecolsIncomeSale = this.tool.tabelCol(this.$route.name)['incomeVoucherSaleTable'].tablecols
+    this.tablecolsPaySale = this.tool.tabelCol(this.$route.name)['payVoucherSaleTable'].tablecols
   },
 }
 

src/SDrpManagement/salerAccount/index.vue

@@ -35,10 +35,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '0'?'#52c41a':'#333333'}">{{scope.data.column.data[[scope.data.column.columnname]] == '0'?'在职':'离职'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'balance'">
-          <span style="color: red">{{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ 0.00':'--'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'expectedReward'">
-          {{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/SDrpManagement/salerAccount/modules/detail.vue

@@ -47,7 +47,10 @@
               {{scope.column.data[[scope.column.columnname]] == '1' ? '收入':'支出'}}
             </div>
             <div v-else-if="scope.column.columnname === 'amount'">
-              {{tool.formatAmount(scope.column.data[[scope.column.columnname]],2)}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ '+'0.00':'--'}}
+            </div>
+            <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ '+'0.00':'¥ 0.00'}}
             </div>
             <div v-else>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerExpenditure/detail/components/income.vue

@@ -28,7 +28,7 @@
           </div>
         </div>
         <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'orderprice'">
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -55,10 +55,13 @@
           {{scope.column.data[[scope.column.columnname]]?Math.round(tool.formatAmount(scope.column.data[[scope.column.columnname]]*100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+        </div>
+        <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerExpenditure/detail/modules/income/add.vue

@@ -17,7 +17,7 @@
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else-if="scope.column.columnname === 'orderprice'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -44,10 +44,13 @@
               {{scope.column.data[[scope.column.columnname]]?Math.round(tool.formatAmount(scope.column.data[[scope.column.columnname]]*100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+            </div>
+            <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerExpenditure/index.vue

@@ -46,7 +46,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
-          <span style="color: red">{{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/SDrpManagement/salerIncome/detail/components/commissionDetails.vue

@@ -44,7 +44,7 @@
           </div>
         </div>
         <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'rewardamount'">
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -56,10 +56,13 @@
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+        </div>
+        <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerIncome/detail/modules/commissionDetails/add.vue

@@ -20,10 +20,10 @@
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerIncome/index.vue

@@ -39,6 +39,11 @@
               end-placeholder="结束日期">
           </el-date-picker>
         </div>
+        <div class="mt-10">
+          <label  class="search__label">订单号:</label>
+          <el-input  style="width:200px;" placeholder="搜索订单号" :suffix-icon="sonum?sonum.length > 0?'':'':'el-icon-search'" v-model="sonum" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname === 'remarks'">
@@ -49,7 +54,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
-          <span style="color: red">{{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
@@ -65,6 +73,7 @@ export default {
   data(){
     return {
       status:'',
+      sonum:'',
       selectDate:[],
       tablecols:[],
     }
@@ -76,6 +85,8 @@ export default {
     },
     selectChange(){
       this.$refs.basicLayout.param.content.where.status = this.status
+      this.$refs.basicLayout.param.content.where.sonum = this.sonum
+      this.$refs.basicLayout.param.content.pageNumner = 1
       if (this.selectDate){
         this.$refs.basicLayout.param.content.where.begdate = this.selectDate[0]
         this.$refs.basicLayout.param.content.where.enddate = this.selectDate[1]

src/components/dynamic-table-detail/index.vue

@@ -0,0 +1,78 @@
+<template>
+  <div>
+    <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
+    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini"  :height="height"  @row-click="rowClick" :style="{width:'100%',minHeight:minHeight?minHeight:''}" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
+              :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange">
+      <el-table-column
+          type="selection"
+          width="35" fixed v-if="checkbox">
+      </el-table-column>
+      <el-table-column show-overflow-tooltip v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="width ? col.width : 150" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+        <template v-slot:header="{ column,$index }" v-if="customHeader">
+          <slot name="header" :data="column"></slot>
+        </template>
+        <template slot-scope="scope">
+          <div class="table-panel">
+            <!-- 自定义表格显示内容 -->
+            <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+            <!-- 否则就是默认 -->
+            <span v-else>{{scope.row[col.columnname]}}</span>
+            <!-- 操作结构内容 -->
+            <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {mapGetters} from "vuex"
+export default {
+  /*
+    layout:表结构数据;
+    data:表渲染数据;
+    custom:是否启用自定义结构;
+    opwidth:操作列宽度
+  */
+  props:['layout','data','custom','height','fixedName','width','checkbox','redirect','customHeader','minHeight'],
+  data () {
+    return {
+      list:[],
+    }
+  },
+  computed:{
+    ...mapGetters({
+      loading:'loading'
+    })
+  },
+  watch:{
+    data(val){
+      this.doLayout()
+    }
+  },
+  methods:{
+    rowClick (row) {
+      this.$emit('rowClick',row)
+    },
+    tableClassName ({row,rowIndex}) {
+      row.index = rowIndex
+    },
+    selectionChange(row){
+      this.$emit('selectionChange',row)
+    },
+    doLayout(){
+      if (this.$refs.table){
+        this.$nextTick(()=>{
+          this.$refs.table.doLayout()
+        })
+      }
+    }
+  },
+  mounted () {
+  }
+}
+
+</script>
+<style>
+</style>

src/components/normal-basic-layout-new/drawerDetail/drawer.vue

@@ -37,8 +37,13 @@ export default {
   },
   methods:{
     closeDrawer (done) {
-      console.log(this.historyRouter,'historyRouter')
+      let contractId = sessionStorage.getItem('contractId')
+      console.log(this.historyRouter,'historyRouter11111')
+      console.log(contractId,'contractId')
       if (this.historyRouter) {
+        console.log('11111')
+        let contractId = sessionStorage.getItem('contractId')
+        console.log(contractId,'contractId')
         if (this.$route.query.isPredicion){
 
           if (this.$route.query.isDetail){
@@ -67,9 +72,33 @@ export default {
         }
 
       } else {
-
-        this.$store.dispatch('changeDetailDrawer',false)
-        this.$router.go(-1)
+        console.log(contractId,'contractId')
+        let contractId = sessionStorage.getItem('contractId')
+        console.log(contractId,'contractId')
+        if (contractId && contractId != 'null'){
+          console.log('执行了111')
+          let rowindexOld = sessionStorage.getItem('rowindexOld')
+          let listqueryidOld = sessionStorage.getItem('listqueryidOld')
+          let typeOld = sessionStorage.getItem('typeOld')
+          this.$store.dispatch('changeDetailDrawer',true)
+          setTimeout(()=>{
+            this.$router.push({path:'/contractDetail',
+              query:{
+                id:contractId,
+                rowindex:rowindexOld,
+                listqueryid:listqueryidOld,
+                type:typeOld,
+                fieldname:'sa_contractid'
+              }})
+            /*this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:this.pageTotal})*/
+            sessionStorage.setItem('contractId',null)
+            this.$store.dispatch('changeDetailDrawer',true)
+          },500)
+        }else {
+          console.log('执行失败了')
+          this.$store.dispatch('changeDetailDrawer',false)
+          this.$router.go(-1)
+        }
       }
     }
   },

src/components/normal-basic-layout/details/index.vue

@@ -24,7 +24,7 @@
           <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
          <div v-if="!pageChange">
             <el-button size="mini" icon="el-icon-arrow-left" @click="previous()" :disabled="$route.query.rowindex == 1"></el-button>
-            <el-button size="mini" @click="next()" :disabled="$route.query.rowindex  == turnTotal"><i class="el-icon-arrow-right" ></i></el-button>
+            <el-button size="mini" @click="next()" :disabled="turnTotal?$route.query.rowindex  == turnTotal:false"><i class="el-icon-arrow-right" ></i></el-button>
           </div>
         </div>
       </div>
@@ -327,6 +327,7 @@ export default {
         }
       })
       if (res.data.data) {
+        sessionStorage.setItem('total',res.data.total)
         this.$router.replace({path:this.$route.path,query:{id:res.data.data,rowindex:res.data.rowindex,listqueryid:listqueryid,fieldname:this.$route.query.fieldname}})
         this.$emit('pageChange',res.data.data,this.$route.query.rowindex)
       } else {

src/components/normal-basic-layout/drawerDetail/drawer.vue

@@ -37,6 +37,7 @@ export default {
   },
   methods:{
     closeDrawer (done) {
+      let contractId = sessionStorage.getItem('contractId')
       console.log(this.historyRouter,'historyRouter')
       if (this.historyRouter) {
         if (this.$route.query.isPredicion){
@@ -71,9 +72,33 @@ export default {
         }
 
       } else {
-
-        this.$store.dispatch('changeDetailDrawer',false)
-        this.$router.go(-1)
+        let contractId = sessionStorage.getItem('contractId')
+        console.log(contractId,'contractId')
+        if (contractId && contractId != 'null'){
+          console.log('执行了111')
+          let rowindexOld = sessionStorage.getItem('rowindexOld')
+          let listqueryidOld = sessionStorage.getItem('listqueryidOld')
+          let typeOld = sessionStorage.getItem('typeOld')
+          let totalOld = sessionStorage.getItem('totalOld')
+          this.$store.dispatch('changeDetailDrawer',false)
+          setTimeout(()=>{
+            this.$router.push({path:'/contractDetail',
+              query:{
+                id:contractId,
+                rowindex:rowindexOld,
+                listqueryid:listqueryidOld,
+                type:typeOld,
+                fieldname:'sa_contract'
+              }})
+            /*this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:this.pageTotal})*/
+            sessionStorage.setItem('contractId',null)
+            sessionStorage.setItem('total',totalOld)
+            this.$store.dispatch('changeDetailDrawer',true)
+          },500)
+        }else {
+          this.$store.dispatch('changeDetailDrawer', false)
+          this.$router.go(-1)
+        }
       }
     }
   },

src/main.js

@@ -20,6 +20,7 @@ import tableLayout from './components/dynamic-table'
 import tableNewLayout from './components/dynamic-newTable'
 import basicLayout from './components/normal-basic-layout'
 import tableMainLayout from './template/tableMainLayout'
+import tableDetail from './components/dynamic-table-detail'
 import normalLayout from './components/normal-basic-layout/normal.vue'
 import basicDetails from './components/normal-basic-layout/details'
 import deleteBtn from './components/delete_btn/index'
@@ -59,6 +60,8 @@ Vue.component('tableNewLayout',tableNewLayout)
 
 Vue.component('tableMainLayout',tableMainLayout)
 
+Vue.component('tableDetail',tableDetail)
+
 Vue.component('basicLayout', basicLayout)
 
 Vue.component('basicDetails', basicDetails)