Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/orderManage/index.vue

@@ -15,7 +15,7 @@
       <template #custom>
         <div class="label_center mt-10">
           <p class="search__label">状态:</p>
-          <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-select v-model="where.status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="change">
             <el-option label="新建" value="新建"></el-option>
             <el-option label="提交" value="提交"></el-option>
             <el-option label="交期待确认" value="交期待确认"></el-option>
@@ -26,7 +26,7 @@
         </div>
         <div class="label_center mt-10">
           <p class="search__label">订单类型:</p>
-          <el-select v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-select v-model="where.type" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="change">
             <el-option label="标准订单" value="标准订单"></el-option>
             <el-option label="特殊订单" value="特殊订单"></el-option>
             <el-option label="项目订单" value="项目订单"></el-option>
@@ -36,7 +36,7 @@
         </div>
         <div class="label_center mt-10">
           <p class="search__label">领域:</p>
-          <el-select v-model="tradefield" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-select v-model="where.tradefield" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="change">
             <el-option
               v-for="(item,index) in tradefieldList"
               :key="index"
@@ -47,7 +47,7 @@
         </div>
         <div class="label_center mt-10">
           <p class="search__label">核销状态:</p>
-          <el-select v-model="hexiaostatus" clearable style="margin-right:10px" size="small" placeholder="请选择核销状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-select v-model="where.writeoffstatus" clearable style="margin-right:10px" size="small" placeholder="请选择核销状态" @change="change">
             <el-option label="已核销" value="已核销"></el-option>
             <el-option label="部分核销" value="部分核销"></el-option>
             <el-option label="未核销" value="未核销"></el-option>
@@ -55,7 +55,7 @@
         </div>
         <div class="label_center mt-10">
           <p class="search__label">开票状态:</p>
-          <el-select v-model="kaipiaostatus" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-select v-model="where.invoicestatus" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="change">
             <el-option label="已开票" value="已开票"></el-option>
             <el-option label="部分开票" value="部分开票"></el-option>
             <el-option label="未开票" value="未开票"></el-option>
@@ -63,22 +63,28 @@
         </div>
         <div class="label_center">
           <p class="search__label">是否退货:</p>
-          <el-select v-model="isback" clearable style="margin-right:10px" size="small" placeholder="请选择退货状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-select v-model="where.isreturn" clearable style="margin-right:10px" size="small" placeholder="请选择退货状态" @change="change">
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
           </el-select>
         </div>
         <div class="label_center">
           <p class="search__label">是否变更:</p>
-          <el-select v-model="ischange" clearable style="margin-right:10px" size="small" placeholder="请选择变更状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
-            <el-option label="未变更" value="未变更"></el-option>
-            <el-option label="已变更" value="已变更"></el-option>
+          <el-select v-model="where.ischange" clearable style="margin-right:10px" size="small" placeholder="请选择变更状态" @change="change">
+            <el-option label="未变更" value="0"></el-option>
+            <el-option label="已变更" value="1"></el-option>
           </el-select>
         </div>
       </template>
       <template v-slot:tbList="scope">
-        <div>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        <div v-if="scope.data.column.columnname == 'ischange'">
+          {{ scope.data.column.data.ischange ? '是' : '否' }}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'isreturn'">
+          {{ scope.data.column.data.isreturn ? '是' : '否' }}
+        </div>
+        <div v-else>
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>
       <template v-slot:tbOpreation="scope">
@@ -94,20 +100,27 @@ export default {
     return {
       options:[],
       tradefieldList:'',
-      status:'',
-      type:'',
-      tradefield:'',
-      hexiaostatus:'',
-      kaipiaostatus:'',
-      isback:'',
-      ischange:''
+      where: {
+        "condition":"",
+        "status" : '',
+        "type" : '',
+        "tradefield": '',
+        "writeoffstatus":"",//未核销,已核销,部分核销"invoicestatus":"未开票"，//未开票,已开票,部分开票"isreturn":"，//是否退回:0,1"ischange":.".//是否变更:0,1
+        "invoicestatus":'',
+        "isreturn": '',
+        "ischange": '',
+      }
       
     }
   },
   methods:{
     list (data) {
       console.log(data);
-      
+    },
+    change () {
+      this.$refs.basicLayout.param.content.pageNumber = 1
+      this.$refs.basicLayout.param.content.where = this.where
+      this.$refs.basicLayout.listData()
     },
     /* 领域 */
     async getTradefield () {

src/HDrpManagement/toolBorrowingMag/index.vue

@@ -30,6 +30,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 /**
  * @basicLayout 提供this.$ref['basicLayout'].listData()方法查询列表信息
  * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
@@ -46,10 +47,9 @@ export default {
     }
   },
   methods:{
+
   },
   mounted () {
-    this.$refs['basicLayout'].param.content.isManage = 1
-    this.$refs['basicLayout'].listData()
   }
 }
 

src/HManagement/marketing2/agent/details/index.vue

@@ -10,7 +10,7 @@
     delApiId="20221011145003"
     idname="sa_agentsid"
     :tags="[]"
-    :tabs="['经销商团队','代理区域','营销类别','账户余额查询','地址管理','联系人管理','财务信息','关联合同','业绩目标','授权领域']"
+    :tabs="['经销商团队','代理区域','营销类别','账户余额查询','地址管理','联系人管理','财务信息','关联合同','业绩目标','授权领域','银行卡信息']"
     @pageChange="pageChange"
     @onEditSuccess="queryMainData($route.query.id)">
     <div slot="tags">
@@ -87,6 +87,17 @@
     <div slot="slot9">
       <field :data="mainData"></field>
     </div>
+    <div slot="slot10">
+      <bankInfo :data="mainData" ref="bank">
+        <addBank v-if="tool.checkAuth($route.name,'bankInfo')" slot="addBank" @onSuccess="$refs.bank.listData()" />
+        <template v-slot:editBank="scope">
+            <editBank v-if="tool.checkAuth($route.name,'bankInfo')" class="inline-16" :data="scope.data" @onSuccess="$refs.bank.listData()" />
+        </template>
+        <template v-slot:delBank="scope">
+            <delete-btn v-if="tool.checkAuth($route.name,'bankInfo')" message="确定删除当前银行卡信息吗?" class="inline-16" nameId="20221022165903" :id="scope.data.sys_enterprise_bankid" nameKey="sys_enterprise_bankids" @deleteSuccess="$refs.bank.listData()"></delete-btn>
+        </template>
+      </bankInfo>
+    </div>
   </basicDetails>
 </template>
 
@@ -100,6 +111,9 @@ import contract from './modules/contract/index'
 import financial from '@/components/financialInfo/index.vue'
 import field from './modules/field/index.vue'
 import achievementTarget from './modules/achievementTarget/index'
+import bankInfo from './modules/bankInfo/index'
+import addBank from './modules/bankInfo/add'
+import editBank from './modules/bankInfo/edit'
 export default {
   data () {
     return {
@@ -122,7 +136,10 @@ export default {
     financial,
     contract,
     field,
-    achievementTarget
+    achievementTarget,
+    bankInfo,
+    addBank,
+    editBank
   },
   methods:{
     async queryMainData (id) {

src/HManagement/marketing2/agent/details/modules/bankInfo/add.vue

@@ -0,0 +1,94 @@
+<template>
+  <div>
+    <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 增</el-button>
+    <el-dialog title="新 建" append-to-body :visible.sync="dialogFormVisible" width="500px">
+      <div slot="title" style="font-size: 15px">
+        新增银行卡信息
+      </div>
+      <el-row :gutter="20">
+        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+          <el-col :span="20">
+            <el-form-item label="银行名称" prop="bank">
+              <el-input v-model="form.bank" placeholder="银行名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="卡号" prop="bankcardno">
+              <el-input v-model="form.bankcardno" placeholder="卡号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="开户人" prop="name">
+              <el-input v-model="form.name" placeholder="开户人"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="手机号码"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "add",
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        "sys_enterprise_bankid": 0,
+        "bank": "",
+        "bankcardno": "",
+        "name": "",
+        "phonenumber": ""
+      },
+      rules:{
+        bank:[
+          { required: true, message: '请输入银行名称', trigger: 'blur'},
+        ],
+        bankcardno:[
+          { required: true, message: '请输入银行卡号', trigger: 'blur'}
+        ],
+        name:[
+          { required: true, message: '请输入开户人', trigger: 'blur'}
+        ],
+        phonenumber:[
+          { pattern:/^1[3-9][0-9]\d{8}$/, message: '请输入正确手机号码',trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  methods:{
+    onSubmit(){
+      console.log(this.form)
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20221022165703",
+          "version":1,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.dialog-footer {
+  margin-top: 0;
+}
+</style>

src/HManagement/marketing2/agent/details/modules/bankInfo/edit.vue

@@ -0,0 +1,99 @@
+<template>
+  <div>
+    <el-button size="mini" type="text" @click="editBtn">编 辑</el-button>
+    <el-dialog title="新 建" append-to-body :visible.sync="dialogFormVisible" width="500px">
+      <div slot="title" style="font-size: 15px">
+        新增银行卡信息
+      </div>
+      <el-row :gutter="20">
+        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+          <el-col :span="20">
+            <el-form-item label="银行名称" prop="bank">
+              <el-input v-model="form.bank" placeholder="银行名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="卡号" prop="bankcardno">
+              <el-input v-model="form.bankcardno" placeholder="卡号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="开户人" prop="name">
+              <el-input v-model="form.name" placeholder="开户人"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="手机号码"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "add",
+  props:['data'],
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        "sys_enterprise_bankid": 0,
+        "bank": "",
+        "bankcardno": "",
+        "name": "",
+        "phonenumber": ""
+      },
+      rules:{
+        bank:[
+          { required: true, message: '请输入银行名称', trigger: 'blur'},
+        ],
+        bankcardno:[
+          { required: true, message: '请输入银行卡号', trigger: 'blur'}
+        ],
+        name:[
+          { required: true, message: '请输入开户人', trigger: 'blur'}
+        ],
+        phonenumber:[
+          { pattern:/^1[3-9][0-9]\d{8}$/, message: '请输入正确手机号码',trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  methods:{
+    editBtn () {
+      this.dialogFormVisible = true
+      this.form = Object.assign({},this.form,this.data)
+    },
+    onSubmit(){
+      console.log(this.form)
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20221022165703",
+          "version":1,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.dialog-footer {
+  margin-top: 0;
+}
+</style>

src/HManagement/marketing2/agent/details/modules/bankInfo/index.vue

@@ -0,0 +1,129 @@
+
+<template>
+  <div>
+    <div style="display:flex;align-items:center">
+      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="params.content.where.condition"
+          style="width:200px"
+          size="mini"
+          class="input-with-select inline-16"
+          @keyup.native.enter="listData(params.content.pageNumber=1)"
+          @clear="clearData"
+          clearable>
+      </el-input>
+      <slot name="addBank"></slot>
+    </div>
+    <div style="margin-top: 15px">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  :height="tableHieght" fixedName="operation">
+        <template v-slot:customcol="scope">
+          <p>{{scope.column.data[scope.column.columnname]}}</p>
+          <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'&& scope.column.columnname != 'reason'">--</p>
+        </template>
+        <template v-slot:opreation="scope">
+          <slot name="editBank" :data="scope.data"></slot>
+          <slot name="delBank" :data="scope.data"></slot>
+        </template>
+      </tableLayout>
+    </div>
+    <div style="margin-top:16px;text-align:right">
+      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="params.content.pageNumber"
+          :page-size="params.content.pageSize"
+          layout="total, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:["data"],
+  data () {
+    return {
+      tableHieght:"calc(100vh - 380px)",
+      tablecols:[],
+      list:[],
+      total:0,
+      params:{
+        "id": 20221022165803,
+        "version":1,
+        "content": {
+            "pageNumber":1,
+            "pageSize":20,
+            "where":{
+              "condition":''
+            }
+        }
+      },
+      options:[
+      ],
+      productList:'',
+      currentProduct:{}
+    }
+  },
+  methods:{
+    async save (data) {
+      let res = await this.$api.requested({
+        "id": "20230105111003",
+        "version":1,
+        "content": {
+            "sa_aftersalesmagid":this.$route.query.id,
+            "iteminfos":[
+                {
+                    "sa_aftersalesmag_itemsid":data.sa_aftersalesmag_itemsid,
+                    "sa_orderitemsid":data.sa_orderitemsid,
+                    "itemid": data.itemid,
+                    "reason":data.reason,
+                    "qty":data.qty,
+                    "price":data.price
+                }
+            ]
+
+        }
+      })
+      this.tool.showMessage(res,() => {
+        this.$emit('onSuccess')
+        this.listData()
+        this.currentProduct = ''
+      })
+    },
+    async listData(){
+      const res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+      console.log(this.list)
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+    clearData(){
+      this.listData()
+    },
+    queryClick(){
+      this.listData()
+    }
+  },
+  created() {
+    this.listData()
+    this.tablecols = this.tool.tabelCol(this.$route.name).bankInfoTable.tablecols
+  }
+}
+
+</script>
+<style scoped>
+
+</style>

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -7,7 +7,8 @@
       idName="sa_customersid"
       :apiId="{query:20221012164402,del:''}"
       :autoQuery="false"
-      :detailPath="{path:'/customerDetail',param:{tabIndex:tabIndex}}">
+      :detailPath="{path:'/customerDetail',param:{tabIndex:tabIndex}}"
+      @listCreate="list">
       <template #custom>
         <div class="mt-10">
           <label class="search__label">范围:</label>
@@ -220,6 +221,11 @@ export default {
     this.industryList()
   },
   methods:{
+    list (param) {
+      param.content.isend = 0
+      param.content.type = 0
+      param.content.isExport = 0
+    },
     queryData(id){
       this.$refs['list'].param.content.type = id
       this.$refs['list'].param.content.isExport = false

src/SDrpManagement/salerToolBorrowing/index.vue

@@ -9,10 +9,10 @@
       tableName="toolBorrowingTable" 
       idName="sa_orderid" 
       :apiId="{query:20230114105002,del:20230116100002}"
-      :autoQuery="false"
       :detailPath="{
         path:'/toolBorrowing_salerDetail'
-      }">
+      }"
+      @listCreate="list">
       <div slot="custom">
       </div>
       <template v-slot:tbList="scope">
@@ -46,10 +46,13 @@ export default {
     }
   },
   methods:{
+    list (param) {
+      console.log(param);
+      
+      param.content.isManage = 0
+    }
   },
   mounted () {
-    this.$refs['basicLayout'].param.content.isManage = 0
-    this.$refs['basicLayout'].listData()
   }
 }
 

src/SDrpManagement/toolBorrowing/index.vue

@@ -9,10 +9,10 @@
       tableName="toolBorrowingTable" 
       idName="sa_orderid" 
       :apiId="{query:20230114105002,del:20230116100002}"
-      :autoQuery="false"
       :detailPath="{
         path:'/toolBorrowingDetail'
-      }">
+      }"
+      @listCreate="list">
       <div slot="custom">
       </div>
       <template v-slot:tbList="scope">
@@ -46,10 +46,15 @@ export default {
     }
   },
   methods:{
+    list (param) {
+      console.log(param);
+      
+      param.content.isManage = 1
+    }
   },
   mounted () {
-    this.$refs['basicLayout'].param.content.isManage = 0
-    this.$refs['basicLayout'].listData()
+    console.log('楚大');
+    
   }
 }