订单查询调整，项目客户详情页联系人新增详情跳转

src/HDrpManagement/contractManage/components/addContract.vue

@@ -44,7 +44,7 @@
             </el-col>-->
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input  size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -144,7 +144,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input  size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -249,7 +249,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input  size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -353,7 +353,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input  size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -752,6 +752,7 @@ export default {
         ],
         discountrate: [
          /* { validator: checkNumber, trigger: 'blur'},*/
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
           { validator: NumberSize, trigger: 'blur'}
         ],
       },
@@ -889,7 +890,13 @@ export default {
                 "id":20221121185302,
                 "content": this.form
               })
+              if (res.code == 0){
+                this.form.discountrate = this.form.discountrate * 100
+                this.form.productdiscount = this.form.productdiscount * 100
+                this.form.orderratio = this.form.orderratio * 100
+              }
               this.tool.showMessage(res,() => {
+
                 this.$store.commit('setLoading',false)
                 console.log(res.data);
                 this.$store.dispatch('DrawerShowChange',false)
@@ -915,7 +922,13 @@ export default {
               "id":20221121185302,
               "content": this.form
             })
+            if (res.code == 0){
+              this.form.discountrate = this.form.discountrate * 100
+              this.form.productdiscount = this.form.productdiscount * 100
+              this.form.orderratio = this.form.orderratio * 100
+            }
             this.tool.showMessage(res,() => {
+
               this.$store.commit('setLoading',false)
               console.log(res.data);
               this.$store.dispatch('DrawerShowChange',false)

src/HDrpManagement/contractManage/components/editContract.vue

@@ -39,7 +39,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate">
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -139,7 +139,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input  size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -244,7 +244,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input  size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -348,7 +348,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="number" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
+                <el-input  size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -576,12 +576,12 @@
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==1">
               <el-form-item label="订单金额比例(%):" prop="orderratio" >
-                <el-input type="number" size="small" v-model.number="form.orderratio" placeholder="请输入0-100%" @change="orderratioChange"></el-input>
+                <el-input  size="small" v-model.number="form.orderratio" placeholder="请输入0-100%" @change="orderratioChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
               <el-form-item label="居间产品折扣(%):" prop="productdiscount">
-                <el-input type="number" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
+                <el-input  size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -730,13 +730,15 @@ export default {
           { required: true, message: '请填写签约时间', trigger: 'change' },
         ],
         productdiscount: [
-          { message: '必须为数字', type:'number', trigger: 'change' },
+         /* { message: '必须为数字', type:'number', trigger: 'change' },*/
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
           { required: true, message: '请填写折扣', trigger: 'blur' },
           /*{ validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
         orderratio: [
-          { message: '必须为数字', type:'number', trigger: 'change' },
+         /* { message: '必须为数字', type:'number', trigger: 'change' },*/
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
           { required: true, message: '请填写折扣', trigger: 'blur' },
          /* { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
@@ -746,6 +748,7 @@ export default {
         ],
         discountrate: [
          /* { validator: checkNumber, trigger: 'blur'},*/
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
           { validator: NumberSize, trigger: 'blur'}
         ],
       },
@@ -870,6 +873,11 @@ export default {
                   "id":20221121185302,
                   "content": this.form
                 })
+                if (res.code == 0){
+                  this.form.discountrate = this.form.discountrate * 100
+                  this.form.productdiscount = this.form.productdiscount * 100
+                  this.form.orderratio = this.form.orderratio * 100
+                }
                 this.tool.showMessage(res,() => {
                   this.$store.commit('setLoading',false)
                   this.$refs.form.resetFields()
@@ -885,6 +893,11 @@ export default {
                 "id":20221121185302,
                 "content": this.form
               })
+              if (res.code == 0){
+                this.form.discountrate = this.form.discountrate * 100
+                this.form.productdiscount = this.form.productdiscount * 100
+                this.form.orderratio = this.form.orderratio * 100
+              }
               this.tool.showMessage(res,() => {
                 this.$store.commit('setLoading',false)
                 this.$refs.form.resetFields()
@@ -909,6 +922,11 @@ export default {
               "id":20221121185302,
               "content": this.form
             })
+            if (res.code == 0){
+              this.form.discountrate = this.form.discountrate * 100
+              this.form.productdiscount = this.form.productdiscount * 100
+              this.form.orderratio = this.form.orderratio * 100
+            }
             this.tool.showMessage(res,() => {
               this.$store.commit('setLoading',false)
               this.$refs.form.resetFields()

src/HDrpManagement/orderManage/index.vue

@@ -80,7 +80,7 @@
           </el-select>
         </div>
         <div class="mt-10">
-          <label class="search__label" >单据日期:</label>
+          <label class="search__label" >审核日期:</label>
           <el-date-picker
               style="margin-right: 24px !important;"
               size="small"

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

@@ -28,6 +28,7 @@
           <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
         </template>
         <template v-slot:opreation="scope">
+          <el-button type="text" size="mini" class="inline-16" @click="goDetail(scope.data)">详 情</el-button>
           <edit  :data="scope.data" class="inline-16" @editSuccess="onSuccess" :disabled="data.disabled" :status="data.status"></edit>
           <delContact  :data="scope.data" @delSuccess="onSuccess" class="inline-16" :disabled="data.disabled" :status="data.status"></delContact>
         </template>
@@ -104,6 +105,21 @@ export default {
     },
     onSuccess(){
       this.listData()
+    },
+    goDetail(val){
+      this.$store.dispatch('changeDetailDrawer',false)
+      this.$nextTick(()=>{
+        let route = this.$route
+        if (route.path !== 'phonebookDetail') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.push({
+          path:'/phonebookDetail',
+          query:{sa_project_contactsid:val.sa_project_contactsid}
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+      })
     }
   },
   mounted() {

src/HDrpManagement/publicCustomer/modules/detail/contacts/list.vue

@@ -24,6 +24,7 @@
         <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
+        <el-button type="text" size="mini" class="inline-16" @click="goDetail(scope.data)">详 情</el-button>
         <edit v-if="tool.checkAuth($route.name,'contactManage')" :data="scope.data" :enterprisename="data.enterprisename"  @updateSuccess="onSuccess"></edit>
         <toVoid v-if="tool.checkAuth($route.name,'contactManage')" :data="scope.data" @toVoidSuccess="onSuccess"></toVoid>
       </template>
@@ -108,6 +109,21 @@ export default {
     queryClick(){
       this.params.content.where.condition = this.search
       this.listData()
+    },
+    goDetail(val){
+      this.$store.dispatch('changeDetailDrawer',false)
+      this.$nextTick(()=>{
+        let route = this.$route
+        if (route.path !== 'phonebookDetail') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.push({
+          path:'/phonebookDetail',
+          query:{contactsid:val.contactsid}
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+      })
     }
   },
   mounted() {

src/SDrpManagement/agentOrder/index.vue

@@ -1,10 +1,10 @@
 
 <template>
   <div>
-    <basicLayout 
+    <basicLayout
       ref="basicLayout"
-      tableName="orderTable" 
-      idName="sa_orderid" 
+      tableName="orderTable"
+      idName="sa_orderid"
       :apiId="{query:20221224180302,del:20221108152102}"
       :options="options"
       :isExport="false"
@@ -36,9 +36,9 @@
         </div>
         <div class="mt-10">
           <p class="search__label">核销状态:</p>
-          <el-select 
-            v-model="writeoffstatus" 
-            clearable style="margin-right:10px" 
+          <el-select
+            v-model="writeoffstatus"
+            clearable style="margin-right:10px"
             size="small" placeholder="请选择核销状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.writeoffstatus = writeoffstatus;$refs.basicLayout.listData()">
             <el-option label="已核销" value="已核销"></el-option>
             <el-option label="部分核销" value="部分核销"></el-option>
@@ -47,9 +47,9 @@
         </div>
         <div class="mt-10">
           <p class="search__label">开票状态:</p>
-          <el-select 
-            v-model="invoicestatus" 
-            clearable style="margin-right:10px" 
+          <el-select
+            v-model="invoicestatus"
+            clearable style="margin-right:10px"
             size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.invoicestatus = invoicestatus;$refs.basicLayout.listData()">
             <el-option label="已开票" value="已开票"></el-option>
             <el-option label="部分开票" value="部分开票"></el-option>
@@ -57,7 +57,7 @@
           </el-select>
         </div>
         <div class="mt-10">
-          <label class="search__label" >单据日期:</label>
+          <label class="search__label" >审核日期:</label>
           <el-date-picker
               style="margin-right: 24px !important;"
               size="small"
@@ -103,8 +103,8 @@
  * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
  * @param {string} tableName 开发端配置的表格名称
  * @param {String} idName 数据主id名称
- * @param {object} apiId:{query:查询的接口id,del:删除的接口id} 
- * @param {Array} options:{label:描述,value:值} 
+ * @param {object} apiId:{query:查询的接口id,del:删除的接口id}
+ * @param {Array} options:{label:描述,value:值}
  */
 export default {
   data () {
@@ -137,4 +137,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SDrpManagement/salerOrder/index.vue

@@ -1,10 +1,10 @@
 
 <template>
   <div>
-    <basicLayout 
+    <basicLayout
       ref="basicLayout"
-      tableName="orderTable" 
-      idName="sa_orderid" 
+      tableName="orderTable"
+      idName="sa_orderid"
       :apiId="{query:20221111145202,del:20221108152102}"
       :options="options"
       :isExport="false"
@@ -35,9 +35,9 @@
         </div>
         <div class="mt-10">
           <p class="search__label">核销状态:</p>
-          <el-select 
-            v-model="writeoffstatus" 
-            clearable style="margin-right:10px" 
+          <el-select
+            v-model="writeoffstatus"
+            clearable style="margin-right:10px"
             size="small" placeholder="请选择核销状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.writeoffstatus = writeoffstatus;$refs.basicLayout.listData()">
             <el-option label="已核销" value="已核销"></el-option>
             <el-option label="部分核销" value="部分核销"></el-option>
@@ -46,9 +46,9 @@
         </div>
         <div class="mt-10">
           <p class="search__label">开票状态:</p>
-          <el-select 
-            v-model="invoicestatus" 
-            clearable style="margin-right:10px" 
+          <el-select
+            v-model="invoicestatus"
+            clearable style="margin-right:10px"
             size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.invoicestatus = invoicestatus;$refs.basicLayout.listData()">
             <el-option label="已开票" value="已开票"></el-option>
             <el-option label="部分开票" value="部分开票"></el-option>
@@ -56,7 +56,7 @@
           </el-select>
         </div>
         <div class="mt-10">
-          <label class="search__label" >单据日期:</label>
+          <label class="search__label" >审核日期:</label>
           <el-date-picker
               style="margin-right: 24px !important;"
               size="small"
@@ -86,7 +86,7 @@
         <!-- <div v-else-if="scope.data.column.columnname == 'tradefield'">
           {{ scope.data.column.data.tradefield }}
         </div> -->
-        
+
         <div v-else-if="scope.data.column.columnname == 'defaultamount'">
           {{ tool.formatAmount(scope.data.column.data.defaultamount,2) }}
         </div>
@@ -109,8 +109,8 @@
  * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
  * @param {string} tableName 开发端配置的表格名称
  * @param {String} idName 数据主id名称
- * @param {object} apiId:{query:查询的接口id,del:删除的接口id} 
- * @param {Array} options:{label:描述,value:值} 
+ * @param {object} apiId:{query:查询的接口id,del:删除的接口id}
+ * @param {Array} options:{label:描述,value:值}
  */
 export default {
   data () {
@@ -121,7 +121,7 @@ export default {
       writeoffstatus:'',
       invoicestatus:'',
       dateSelect:[]
-      
+
     }
   },
   methods:{
@@ -141,4 +141,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/modules/contacts/list.vue

@@ -23,6 +23,7 @@
         <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
+        <el-button class="inline-16" type="text" size="mini" @click="goDetail(scope.data)">详 情</el-button>
         <edit  :data="scope.data" :enterprisename="data.enterprisename" :disabled="data.disabled" @updateSuccess="onSuccess"></edit>
         <toVoid  :data="scope.data" :disabled="data.disabled" @toVoidSuccess="onSuccess" ></toVoid>
       </template>
@@ -109,6 +110,21 @@ export default {
     queryClick(){
       this.params.content.where.condition = this.search
       this.listData()
+    },
+    goDetail(val){
+      this.$store.dispatch('changeDetailDrawer',false)
+      this.$nextTick(()=>{
+        let route = this.$route
+        if (route.path !== 'phonebookDetail') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.push({
+          path:'/phonebookDetail',
+          query:{contactsid:val.contactsid}
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+      })
     }
   },
   mounted() {

src/views/salesData/components/allSalesTemplate.vue

@@ -94,7 +94,7 @@
                 end-placeholder="结束月份">
             </el-date-picker>
           </div>
-          <exportFile class="inline-16" :param="param" :columns="tablecols" :fileName="buttonTitle === '客户全部排名'?'客户销售排名':'业务员销售排名'"></exportFile>
+          <exportFile class="inline-16" :param="param" :columns="tablecols" :fileName="buttonTitle === '客户全部排名'?'客户销售排名':'业务员销售排名'" :dataid="dataid"></exportFile>
         </div>
         <div style="margin-top: 10px;margin-bottom: 10px">
           <tableTemplate ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="height">

src/views/salesData/components/financialCollectionDetail.vue

@@ -15,6 +15,7 @@
             <span class="search__label">搜索:</span>
             <el-input style="width:300px;" 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="input-with-select inline-16 layout_search__panel" clearable>
             </el-input>
+            <exportFile :param="param" :columns="tablecols" :fileName="data.erpagentnum+ ' ' + data.enterprisename + '_' + unwriteoffamounttype + '未回款明细'" :dataid="dataid"></exportFile>
           </div>
           <div style="float: right">
             <span class="search__label">分析日期:</span>
@@ -89,9 +90,10 @@
 
 <script>
 import tableTemplate from '@/views/salesData/components/table';
+import exportFile from '@/components/export_file/index'
 export default {
   name: "financialCollectionDetail",
-  components:{tableTemplate},
+  components:{tableTemplate,exportFile},
   props:["type","dataid","sys_enterpriseid","data","unwriteoffamounttype","isFull"],
   data(){
     return {

src/views/salesData/modules/orderType.vue

@@ -89,7 +89,7 @@ import exportFile from '@/components/export_file/index'
 const G = G2.getEngine('canvas');
 export default {
   name: "orderType",
-  props:['dataid','scrollHeight','windowWidth'],
+  props:['dataid','scrollHeight','windowWidth','pagerCount'],
   components:{tableTemplate,fullScreen,exportFile},
   data(){
     return {