2023-2-10

src/Form/EnterpriseArchives/add.vue

@@ -35,6 +35,24 @@
                 <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="免运费额度" prop="freefreightamount">
+                <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="可退货天数" prop="limitreturnday">
+                <el-input v-model.number="form.limitreturnday" placeholder="请输入订单可退货天数"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开票节点" prop="invoicingpoint">
+                <el-radio-group v-model="form.invoicingpoint">
+                  <el-radio :label="1">订单审核</el-radio>
+                  <el-radio :label="2">发货</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="企业等级">
                 <el-select style="width:100%" v-model="form.grade" placeholder="请选择">
@@ -70,9 +88,22 @@ export default {
     return {
       dialogFormVisible:false,
       form:{
-        enterprisename:'',
-        value:[],
-        sys_enterpriseid:0
+        "address": "",
+        "city": "",
+        "changeby": "",
+        "county": "",
+        "phonenumber": "",
+        "sys_enterpriseid": 0,
+        "enterprisename": "",
+        "province": "",
+        "contact": "",
+        "taxno": "",
+        "limitreturnday": "", //订单可退货天数
+        "freefreightamount": "", //免运费额度
+        "latitude": "", //纬度
+        "longitude": "", //经度
+        "invoicingpoint": 1, //开票节点（1:订单审核：2:发货）
+        "saleclassauth": 1 //是否需要经营授权,默认1
       },
       agent_level:[],
       rules:{
@@ -95,6 +126,12 @@ export default {
         address:[
           { required: true, message: '输入详细地址', trigger: 'blur' },
         ],
+        freefreightamount:[
+          {type:'number',message:'请输入数字',trigger:'blur'}
+        ],
+        limitreturnday:[
+          {type:'number',message:'请输入数字',trigger:'blur'}
+        ],
       }
     }
   },

src/Form/marketing2/agent/add.vue

@@ -4,7 +4,7 @@
     <el-drawer title="创建经销商" direction="rtl" size="50%" append-to-body :visible.sync="dialogVisible" @close="onClose">
       <div class="drawer__panel">
       <el-row :gutter="20">
-        <el-form :model="form" ref="form" :rules="rules" :status-icon="false"	 size="small" label-position="right" label-width="100px" class="demo-form-inline">
+        <el-form :model="form" ref="form" :rules="rules" :status-icon="false"	 size="small" label-position="right" label-width="120px" class="demo-form-inline">
           <el-col :span="24">
             <p class="normal-title normal-margin">企业信息</p>
           </el-col>
@@ -106,6 +106,11 @@
               </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>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       </div>
@@ -146,15 +151,20 @@ export default {
       dialogVisible:false,
       visible:false,
       form:{
-        "enterprisename":'',
-        "sa_agentsid": 0,
-        "parentid":"",
-        "agentnum":"",
-        "signdate":"",
-        "grade":'1',
-        "sa_saleareaid":null,
-        "sys_enterpriseid":null,
-        "sa_saleareaids":[]
+        "enterprisename": "",
+        "sa_agentsid": '',
+        "parentid": "",
+        "agentnum": "",
+        "signdate": "",
+        "grade": "",
+        "sa_saleareaid": '',
+        "sys_enterpriseid": '',
+        "sa_saleareaids": [
+
+        ],
+        "type": "",
+        "erpagentnum": "",
+        "isservice": 1 //是否服务商，0或1
       },
       ENlist:[],
       agent_level:[],

src/Form/marketing2/agent/edit.vue

@@ -4,7 +4,7 @@
     <el-drawer title="编辑经销商" direction="rtl" size="50%" append-to-body :visible.sync="dialogVisible">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" ref="form" :rules="rules" size="small" label-position="right" label-width="100px" class="demo-form-inline">
+          <el-form :model="form" ref="form" :rules="rules" size="small" label-position="right" label-width="120px" class="demo-form-inline">
             <el-col :span="24">
               <p class="normal-title normal-margin">企业信息</p>
             </el-col>
@@ -119,6 +119,11 @@
                 </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>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -157,15 +162,20 @@ export default {
       dialogVisible:false,
       visible:false,
       form:{
-        "enterprisename":'',
-        "sa_agentsid": 0,
-        "parentid":"",
-        "agentnum":"",
-        "signdate":"",
-        "grade":'1',
-        "sa_saleareaid":null,
-        "sys_enterpriseid":null,
-        "sa_saleareaids":[]
+        "enterprisename": "",
+        "sa_agentsid": '',
+        "parentid": "",
+        "agentnum": "",
+        "signdate": "",
+        "grade": "",
+        "sa_saleareaid": '',
+        "sys_enterpriseid": '',
+        "sa_saleareaids": [
+
+        ],
+        "type": "",
+        "erpagentnum": "",
+        "isservice": 1 //是否服务商，0或1
       },
       ENlist:[],
       agent_level:[],

src/HDrpManagement/orderManage/modules/add.vue

@@ -28,7 +28,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="选择经销商" prop="sys_enterpriseid">
-                <enterprise @rowClick="rowClick"></enterprise>
+                <enterprise type='1' @rowClick="rowClick"></enterprise>
               </el-form-item>
             </el-col>
             <el-col v-if="form.type === '促销订单'" :span="12">

src/HManagement/EnterpriseArchives/index.vue

@@ -14,7 +14,13 @@
       <div slot="custom"></div>
       <template v-slot:tbList="scope">
         <div>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+          <p v-if="scope.data.column.columnname === 'province'">
+            {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
+          </p>
+          <p v-else-if="scope.data.column.columnname === 'invoicingpoint'">
+            {{scope.data.column.data.invoicingpoint == 1 ? '订单审核' : '发货'}}
+          </p>
+          <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}</p>
         </div>
       </template>
 

src/HManagement/EnterpriseArchives/modules/details.vue

@@ -51,6 +51,18 @@ export default {
           label:'企业名称',
           value: this.mainData.enterprisename
         },
+        {
+          label:'免运费额度',
+          value: this.mainData.freefreightamount
+        },
+        {
+          label:'订单可退货天数',
+          value: this.mainData.limitreturnday
+        },
+        {
+          label:'是否审核订单可开票',
+          value: this.mainData.invoicingpoint == 1 ? '订单审核' : '发货'
+        },
         {
           label:'省市县',
           value: `${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`

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

@@ -127,6 +127,10 @@ export default {
           label:'erp经销商编号',
           value: this.mainData.erpagentnum
         },
+        {
+          label:'是否服务经销商',
+          value: this.mainData.isservice
+        },
         {
           label:'签约日期',
           value: this.mainData.signdate

src/HManagement/marketing2/agent/index.vue

@@ -38,6 +38,9 @@
             <p v-if="scope.data.column.columnname === 'province'">
               {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
             </p>
+            <p v-else-if="scope.data.column.columnname === 'isservice'">
+              {{scope.data.column.data.isservice ? '是' : '否'}}
+            </p>
             <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}</p>
           </div>
         </template>

src/template/enterprise/index.vue

@@ -60,6 +60,7 @@ export default {
   components:{
     addTemp
   },
+  props:['type'],
   data () {
     return {
       ENlist:[],
@@ -75,6 +76,7 @@ export default {
           "pageSize": 10,
           "where": {
             "condition": '',
+            "type":''
           },
           "sort":[{
             "sortname":"默认",
@@ -89,6 +91,7 @@ export default {
   },
   methods:{
     async queryEnterpriseArchives () {
+      if (this.type) this.params.content.where.type = this.type
       const res = await this.$api.requested(this.params)
       this.ENlist = res.data
       this.total = res.total