2023-2-15 end

src/Form/marketing2/agent/add.vue

@@ -90,22 +90,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="营销区域:" prop="sa_saleareaids">
-              <el-cascader
-                style="width:100%"
-                v-model="form.sa_saleareaids"
-                :options="arealist"
-                :props="{
-                  value:'sa_saleareaid',
-                  label:'areaname',
-                  children:'subarea'
-                }"
-                :show-all-levels="false"
-                @change="onCascaderChange">
-              </el-cascader>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="是否服务经销商:" prop="isservice">
               <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
@@ -138,9 +122,6 @@ export default {
         agentnum: [
           { required: true, message: '请输入经销商编号', trigger: 'blur' },
         ],
-        sa_saleareaids: [
-          { required: true, message: '请选择营销区域', trigger: 'change' },
-        ],
         type: [
           { required: true, message: '请选择经销商类型', trigger: 'change' },
         ],
@@ -157,7 +138,6 @@ export default {
         "agentnum": "",
         "signdate": "",
         "grade": "",
-        "sa_saleareaid": '',
         "sys_enterpriseid": '',
         "sa_saleareaids": [
 

src/Form/marketing2/agent/edit.vue

@@ -103,22 +103,6 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
-            <el-col :span="12">
-              <el-form-item label="营销区域" prop="sa_saleareaids">
-                <el-cascader
-                  style="width:100%"
-                  v-model="form.sa_saleareaids"
-                  :options="arealist"
-                  :props="{
-                    value:'sa_saleareaid',
-                    label:'areaname',
-                    children:'subarea'
-                  }"
-                  :show-all-levels="false"
-                  @change="onCascaderChange">
-                </el-cascader>
-              </el-form-item>
-            </el-col>
             <el-col :span="12">
             <el-form-item label="是否服务经销商:" prop="isservice">
                 <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
@@ -168,7 +152,6 @@ export default {
         "agentnum": "",
         "signdate": "",
         "grade": "",
-        "sa_saleareaid": '',
         "sys_enterpriseid": '',
         "sa_saleareaids": [
 

src/HDrpManagement/BrandManage/component/saleclass/components/addTop.vue

@@ -45,6 +45,8 @@ export default {
       ruleForm: {
         "itemclassnum":'',
         "itemclassname":'',
+        "istool":'',
+        "ishide":''
       },
       rules:{
         itemclassname: [

src/HDrpManagement/BrandManage/component/saleclass/components/edit.vue

@@ -20,6 +20,10 @@
         <el-form-item label="营销类别编号" prop="itemclassnum">
           <el-input v-model="ruleForm.itemclassnum" :disabled="type!='add'" size="small" placeholder="请输入营销类别编号"></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-checkbox v-model="ruleForm.istool" :true-label="1" :false-label="0">是否工具</el-checkbox>
+          <el-checkbox v-model="ruleForm.ishide" :true-label="1" :false-label="0">是否隐藏</el-checkbox>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <div>
@@ -42,6 +46,8 @@ export default {
       ruleForm: {
         "itemclassnum":'',
         "itemclassname":'',
+        "istool":'',
+        "ishide":''
         // "itemclassfullname":'',
       },
       rules:{

src/HDrpManagement/orderManage/index.vue

@@ -47,7 +47,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="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-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="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="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-option label="已开票" value="已开票"></el-option>
             <el-option label="部分开票" value="部分开票"></el-option>
             <el-option label="未开票" value="未开票"></el-option>
@@ -63,14 +63,14 @@
         </div>
         <div class="label_center">
           <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="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-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="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="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>

src/HDrpManagement/stock/index.vue

@@ -7,7 +7,7 @@
         add:'HDrpManagement/stock/modules'
       }"
       tableName="stockTable" 
-      idName="stockids" 
+      idName="stockid" 
       :apiId="{query:20230104094604,del:20230104095004}"
       :detailPath="null">
       <div slot="custom"></div>
@@ -19,7 +19,7 @@
         </div>
       </template>
       <template v-slot:tbOpreation="scope">
-        <edit :data="scope.data.data"></edit>
+        <edit :data="scope.data.data" @onSuccess="$refs.basicLayout.listData()"></edit>
       </template>
     </basicLayout>
   </div>

src/HDrpManagement/stock/modules/add.vue

@@ -65,7 +65,7 @@ export default {
             "id": 20230104094704,
             "content": this.form
           })
-          this.tool.showMessage(()=>{
+          this.tool.showMessage(res,()=>{
             this.drawer = false
             this.$emit('onSuccess')
           })

src/HDrpManagement/stock/modules/edit.vue

@@ -69,8 +69,12 @@ export default {
             "id": 20230104094704,
             "content": this.form
           })
-          this.tool.showMessage(()=>{
+          console.log(res);
+          
+          this.tool.showMessage(res,()=>{
             this.drawer = false
+            console.log('触发');
+            
             this.$emit('onSuccess')
           })
         } else {

src/HManagement/marketing2/agent/area/list.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="tree-panel">
+    <div style="margin-bottom:10px;text-align:left">
+      <el-button :type="btnType" size="mini" @click="$emit('onClick','isAll')">全部区域</el-button>
+    </div>
     <el-tree
       ref="treeRef"
       :data="arealist"
@@ -29,7 +32,9 @@ export default {
   data () {
     return {
       arealist:[],
-      currentKey:null
+      currentKey:null,
+      btnType:'primary',
+      currentData:''
     }
   },
   methods:{
@@ -42,7 +47,6 @@ export default {
       })
       // 数据格式转换成elementui-tree所需的格式
       this.arealist = this.createMenu(res.data)
-      callback()
     },
     createMenu (array) {
       var that = this
@@ -73,6 +77,7 @@ export default {
       return arr
     },
     handleClick (row,node,VueComponent) {
+      this.currentData = node.data
       this.$emit('onClick',node.data)
     },
     setCurrentKey (id) {
@@ -83,12 +88,14 @@ export default {
     },
   },
   mounted () {
-    this.query_arealist(()=>{
-      if (this.noDefaultData === undefined) {
-        this.$emit('onClick',this.arealist[0])
-        this.setCurrentKey(this.arealist[0].sa_saleareaid)
-      }
-    })
+    // this.query_arealist(()=>{
+    //   if (this.noDefaultData === undefined) {
+    //     this.$emit('onClick',this.arealist[0])
+    //     this.setCurrentKey(this.arealist[0].sa_saleareaid)
+    //   }
+    // })
+    this.$emit('onClick','isAll')
+    this.query_arealist()
   }
 }
 

src/HManagement/marketing2/agent/index.vue

@@ -13,7 +13,7 @@
         :apiId="{query:20221011144903,del:20221011145003}"
         :autoQuery="false"
         :options="options"
-        @listData="list">
+        @listCreate="list">
         <div slot="custom">
           <div class="label_center">
             <span class="search_label">状态: </span>
@@ -55,6 +55,7 @@ import addArea from './area/modules/add_area'
 import editArea from './area/modules/edit_area'
 import startArea from './area/modules/start_area'
 import delArea from './area/modules/del_area'
+import { log } from '@antv/g2plot/lib/utils'
 
 export default {
   components:{
@@ -72,6 +73,11 @@ export default {
       statusList:[]
     }
   },
+  provide () {
+    return {
+      areaInfo:() => this.areaInfo
+    }
+  },
   created () {
     this.userstatus()
   },
@@ -96,11 +102,23 @@ export default {
       this.$refs['basicLayout'].listData()
     },
     onClick (data) {
-      this.areaInfo = data
-      this.$refs['basicLayout'].param.content.sa_saleareaids = [data.sa_saleareaid]
-      this.$refs['basicLayout'].param.content.containssub = 1
-      this.$refs['basicLayout'].listData()
-      this.$store.dispatch('sendDataToForm',data)
+      if (typeof data == 'string') {
+        this.$refs.arealist.btnType = 'primary'
+        this.$refs.arealist.$refs.treeRef.setCurrentKey(null)
+        this.$refs['basicLayout'].param.content.isAll = 1
+        this.$refs['basicLayout'].param.content.sa_saleareaids = []
+        this.$refs['basicLayout'].param.content.containssub = 1
+        this.$refs['basicLayout'].listData()
+      } else {
+        this.areaInfo = data
+        this.$refs.arealist.btnType = 'info'
+        this.$refs['basicLayout'].param.content.sa_saleareaids = [data.sa_saleareaid]
+        this.$refs['basicLayout'].param.content.containssub = 1
+        this.$refs['basicLayout'].param.content.isAll = 0
+        this.$refs['basicLayout'].listData()
+        this.$store.dispatch('sendDataToForm',data)
+      }
+      
     },
     onSuccess () {
       this.$refs.arealist.query_arealist()
@@ -118,9 +136,8 @@ export default {
     onStartArea (status) {
       status === 1?this.areaInfo.isused = 0:this.areaInfo.isused = 1
     },
-    list(data) {
-      console.log(data);
-      
+    list(param) {
+      param.content.isAll = 0
     }
   }
 }

src/HManagement/marketing2/customerFile/index.vue

@@ -0,0 +1,54 @@
+
+<template>
+      <!-- :oldFormPath="{
+        add:'HDrpManagement/serveBill/components'
+      }" -->
+  <div>
+    <basicLayout 
+      ref="list" 
+      tableName="customerTable" 
+      idName="sa_customersid" 
+      :apiId="{query:20221012164402,del:''}"
+      :options="options"
+      :detailPath="{
+      }"
+      @listCreate="list">
+      <div slot="custom" style="display:flex">
+      </div>
+      <template v-slot:tbList="scope">
+        <div v-if="scope.data.column.columnname == 'province'">
+          {{ `${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}` }}
+        </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">
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      options:[],
+      where: {
+        status:'',
+        date: ''
+      }
+    }
+  },
+  methods:{
+    list (param) {
+      param.content.isend = 1
+      param.content.type = 0
+      param.content.isExport = 0
+    }
+  }
+}
+
+</script>
+<style>
+</style>

src/components/financialInfo/index.vue

@@ -32,7 +32,7 @@
       </el-table-column>
       <el-table-column
         prop="taxno"
-        label="统一社会信用代码">
+        label="税号">
       </el-table-column>
       <el-table-column
         prop="bank"

src/components/financialInfo/modules/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button type="text" size="mini" @click="onShow(drawer = true)">编 辑</el-button>
     <el-drawer
-      title="新建"
+      title="编辑"
       :visible.sync="drawer"
       direction="rtl"
       append-to-body
@@ -16,10 +16,10 @@
             <el-input v-model="form.address" placeholder="开票地址"></el-input>
           </el-form-item>
           <el-form-item label="税号" prop="taxno">
-            <el-input v-model="form.taxno" placeholder="统一社会信用代码"></el-input>
+            <el-input v-model="form.taxno" placeholder="税号"></el-input>
           </el-form-item>
           <el-form-item label="开户行" prop="bank">
-            <el-input v-model="form.bank" placeholder="统一社会信用代码"></el-input>
+            <el-input v-model="form.bank" placeholder="开户行"></el-input>
           </el-form-item>
           <el-form-item label="开户账号" prop="bankcardno">
             <el-input v-model="form.bankcardno" placeholder="开户账号"></el-input>

src/router/HManagement.js

@@ -164,6 +164,27 @@ const HManagement = [
         component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing2/saler/area/detail/index')
       }
     ]
+  }, {
+    path: '/customerFile',
+    name: 'customerFile',
+    meta: {
+      title: '终端客户档案',
+      ast_nav: true,
+      keeproute:true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing2/customerFile/index.vue'),
+    // children:[
+    //   {
+    //     path: '/agent_detail',
+    //     name: 'agentManage',
+    //     meta: {
+    //       title: '经销商详情',
+    //       ast_nav: true,
+    //       keeproute: true
+    //     },
+    //     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing2/agent/details/index.vue')
+    //   }
+    // ]
   },
   {
     path: '/EnterpriseArchives',