2023-2-20

src/Form/payvoucher/add.vue

@@ -12,8 +12,8 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="经销商:" prop="enterprisename">
-                <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>
+              <el-form-item label="选择企业:" prop="enterprisename">
+                <el-input v-model="form.enterprisename"  placeholder="请选择企业" @focus="enterpriseList"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" >

src/Form/payvoucher/edit.vue

@@ -12,8 +12,8 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="经销商:" prop="enterprisename">
-                <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>
+              <el-form-item label="选择企业:" prop="enterprisename">
+                <el-input v-model="form.enterprisename"  placeholder="请选择企业" @focus="enterpriseList"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" >

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -20,8 +20,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="序号:" prop="sequence">
-                <el-input type="text" size="small" v-model="form.sequence"></el-input>
+              <el-form-item label="默认商品:" prop="sequence">
+                <selectProduct ref="product" @selectRow="productChange" :productData="tableData">
+                  <el-input readonly type="text" slot="input" size="small" @focus="$refs.product.visible=true" v-model="form.itemname"></el-input>
+                </selectProduct>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -52,10 +54,11 @@
 <script>
 import previewImage from '@/components/previewImage/index.vue'
 import selectTable from '@/template/product/index.vue'
+import selectProduct from '@/template/selectProduct/index.vue'
 import Table from './table.vue'
 export default {
   props: ['data', 'type'],
-  components:{selectTable,previewImage,Table},
+  components:{selectTable,previewImage,Table,selectProduct},
   data () {
     return {
       drawer:false,

src/HDrpManagement/ProductMag/modules/addClass.vue

@@ -52,7 +52,10 @@ export default {
           "id": "20220922110403",
           "version":1,
           "content": {
-            "sa_brandid":0
+            "sa_brandid":0,
+            "where": {
+              istool: this.data.istool ? 1 : 0
+            }
           }
       })
       console.log(res.data);

src/HDrpManagement/contractManage/modules/detail.vue

@@ -21,7 +21,7 @@
         <reverseCheck class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status === '审核'"  />
         <revoke class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'revoke') && mainData.status === '已提交' && isLeader" ></revoke>
         <contractOver class="inline-16" v-if="tool.checkAuth($route.name,'contractOver') && mainData.status != '已终止' && mainData.status != '审核' && isLeader" :disabled="!isLeader" :id="mainData.sa_contractid" @onSuccess="queryMainData" />
-        <Del class="inline-16" :idName="20221121202502" :id="mainData.sa_contractid" idKey="sa_contractids"  v-if="tool.checkAuth($route.name,'toVoid') && mainData.status == '新建' && isLeader"/>
+        <Del class="inline-16" :idName="20221121202502" :id="mainData.sa_contractid" idKey="sa_contractids"  v-if="tool.checkAuth($route.name,'toVoid') && (mainData.status == '新建' || mainData.status == '已终止') && isLeader"/>
       </div>
       <div slot="slot0" >
         <!--产品清单表-->

src/HDrpManagement/dispatch/details/index.vue

@@ -55,7 +55,7 @@ import { log } from '@antv/g2plot/lib/utils'
             "sa_dispatchid":this.$route.query.id
           }
         })
-        this.mainData = res.data
+        this.mainData = res.data.recvice
         console.log(this.mainData)
         this.changeDataStructure()
       },

src/HDrpManagement/dispatch/modules/defaultInfo.vue

@@ -15,8 +15,8 @@
     </el-descriptions>
     <el-descriptions class="normal-margin" :column="2"  border labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">收货信息</div>
-      <el-descriptions-item label="联系人">{{ mainData.logiscompenterprisename?mainData.logiscompenterprisename:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="联系人电话">{{ mainData.logiscompphonenumber?mainData.logiscompphonenumber:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="联系人">{{ mainData.name?mainData.name:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="联系人电话">{{ mainData.phonenumber?mainData.phonenumber:"--" }}</el-descriptions-item>
       <el-descriptions-item label="省市县">{{ `${mainData.province}-${mainData.city}-${mainData.county}` }}</el-descriptions-item>
       <el-descriptions-item label="地址">{{ mainData.address?mainData.address:"--" }}</el-descriptions-item>
     </el-descriptions>

src/HDrpManagement/logistics/details/index.vue

@@ -29,7 +29,8 @@
         </div>
         <div  slot="slot2">
           <addBox v-if="tool.checkAuth($route.name,'boxInfo')" class="mt-10" @onSuccess="onBoxSuccess"></addBox>
-          <boxlist ref="boxlist"></boxlist>
+          <boxlist v-if="tool.checkAuth($route.name,'addBoxInfo')" ref="boxlist"></boxlist>
+          <el-empty description="暂无查询权限" v-else></el-empty>
         </div>
         <div  slot="slot3">
           <courierRecords></courierRecords>
@@ -86,6 +87,23 @@
             label:'单据日期',
             value:this.mainData.billdate
           },
+          {
+            label:'车牌号',
+            value:this.mainData.carnum
+          },
+          {
+            label:'物流联系人',
+            value:this.mainData.logiscontact
+          },
+          {
+            label:'物流电话',
+            value:this.mainData.logisphone
+          },
+          {
+            label:'运费',
+            value:this.mainData.freightamount
+          },
+
           {
             label:'状态',
             value:this.mainData.status,

src/HDrpManagement/logistics/index.vue

@@ -13,7 +13,7 @@
           path:'/logisticsdetail'
         }">
         <div slot="custom"></div>
-        <template v-slot:tbList="scope">、
+        <template v-slot:tbList="scope">
           <div v-if="scope.data.column.columnname == 'status'">
             <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
             <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>

src/HDrpManagement/logistics/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button type="primary" size="small" @click="drawer = true">新建物流单</el-button>
     <el-drawer
-    title="创建物流单"
+    title="新建物流单"
     :visible.sync="drawer"
     direction="rtl"
     size="80%"
@@ -11,8 +11,8 @@
     <div class="drawer__panel">
       <p class="normal-title normal-margin">基础信息</p>
       <el-form :inline="true" :model="form" class="demo-form-inline" size="small" label-width="100px" label-position="right">
-        <el-form-item label="经销商名称">
-          <enterprise ref="ent" @rowClick="entRowClick"></enterprise>
+        <el-form-item label="企业名称" prop="">
+          <enterprise :qiyi="true" ref="ent" @rowClick="entRowClick"></enterprise>
         </el-form-item>
         <el-form-item label="物流公司">
           <logisticcom ref="logis" @logisticRowClick="logisticRowClick"></logisticcom>
@@ -32,9 +32,21 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="车牌号">
+          <el-input v-model.number="form.carnum" placeholder="车牌号"></el-input>
+        </el-form-item>
+        <el-form-item label="物流联系人">
+          <el-input v-model.number="form.logiscontact" placeholder="物流联系人"></el-input>
+        </el-form-item>
+        <el-form-item label="物流电话">
+          <el-input v-model.number="form.logisphone" placeholder="物流电话"></el-input>
+        </el-form-item>
         <el-form-item label="运费">
           <el-input v-model.number="form.freightamount" placeholder="运费"></el-input>
         </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model.number="form.remarks" placeholder="运费"></el-input>
+        </el-form-item>
         <el-form-item label="单据日期">
           <el-date-picker
             v-model="form.billdate"
@@ -86,7 +98,7 @@
 </template>
 <script>
 import dispatchTable from './dispatchTable.vue'
-import enterprise from '@/template/enterprise/index.vue'
+import enterprise from './enterprise'
 import logisticcom from '@/template/selectLogisticcom/index.vue'
 import addDisbill from '@/template/logisyticCanUseDisBill/index.vue'
 export default {
@@ -103,8 +115,24 @@ export default {
       dialogAddress:false,
       setcol:24,
       form:{
-        paytype:"到付",
-        billdate:new Date()
+        "freightamount": "",
+        "logisticno": "",
+        "paytype": "",
+        "remarks": "",
+        "sa_dispatchids": [],
+        "sa_logiscompid": 0,
+        "sa_logisticsid": 0,
+        "sys_enterpriseid": '',
+        "carnum":"",
+        "logisphone":"",
+        "logiscontact":"",
+        "rec_contactsid":'',
+        billdate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDay()}`
+      },
+      rules:{
+        point:[
+          { required: true, message: '请选择账期依据', trigger: 'change'},
+        ],
       },
       enterpriseInfo:null,
       rec_address:[],
@@ -126,6 +154,7 @@ export default {
     },
     entRowClick (row) {
       this.enterpriseInfo = row
+      this.form.sys_enterpriseid = row.sys_enterpriseid
     },
     logisticRowClick (row) {
       console.log(row)
@@ -139,24 +168,15 @@ export default {
       this.$refs['dislist'].tableData = unique([...this.$refs['dislist'].tableData,...data],'billno')
     },
     async onSubmit () {
+      this.form.sa_dispatchids = this.$refs['dislist'].tableData.map(e=>{
+        return e.sa_dispatchid
+      })
       const res = await this.$api.requested({
         "id": "202212004124804",
-        "content": {
-          "sa_logisticsid": 0,
-          "sys_enterpriseid": this.enterpriseInfo.sys_enterpriseid,
-          "sa_logiscompid": this.form.sa_logiscompid,
-          "remarks": "",
-          "logisticno": "",
-          "paytype": this.form.paytype,
-          // "freightstatus": this.form.paytype,
-          "billdate":this.form.billdate,
-          "freightamount":this.form.freightamount,
-          "sa_dispatchids":this.$refs['dislist'].tableData.map(e=>{
-            return e.sa_dispatchid
-          }),
-          "rec_contactsid":this.form.rec_contactsid
-        }
+        "content": this.form
       })
+      console.log(res);
+      
       if (Array.isArray(res.data)) {
         this.dialogAddress = true
         this.rec_address = res.data
@@ -168,6 +188,7 @@ export default {
           this.form = {}
         })
       }
+      this.$router.push({path:'/logisticsdetail',query:{id:res.data.sa_logisticsid,rowindex:res.data.rowindex}})
     },
     selectAddress (row) {
       this.form.rec_contactsid = row.rec_contactsid

src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -24,8 +24,23 @@
       label="企业名称">
     </el-table-column>
     <el-table-column
-      prop="logiscomp"
-      label="物流公司">
+      prop="recheckby"
+      label="收货人">
+    </el-table-column>
+    <el-table-column
+      prop="contactsphonenumber"
+      label="收货人联系电话">
+    </el-table-column>
+    <el-table-column
+      prop="province"
+      label="省市县">
+      <template slot-scope="scope" v-if="scope.row.province">
+        {{`${scope.row.province}-${scope.row.city}-${scope.row.county}`}}
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="address"
+      label="地址">
     </el-table-column>
     <el-table-column
     v-if="type === 'edit'"

src/HDrpManagement/logistics/modules/edit.vue

@@ -33,6 +33,15 @@ ed<template>
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="车牌号">
+          <el-input v-model.number="form.carnum" placeholder="车牌号"></el-input>
+        </el-form-item>
+        <el-form-item label="物流联系人">
+          <el-input v-model.number="form.logiscontact" placeholder="物流联系人"></el-input>
+        </el-form-item>
+        <el-form-item label="物流电话">
+          <el-input v-model.number="form.logisphone" placeholder="物流电话"></el-input>
+        </el-form-item>
         <el-form-item label="运费">
           <el-input v-model.number="form.freightamount" placeholder="运费"></el-input>
         </el-form-item>
@@ -45,6 +54,9 @@ ed<template>
             placeholder="单据日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model.number="form.remarks" placeholder="运费"></el-input>
+        </el-form-item>
       </el-form>
       <div class="mt-10">
         <div class="normal-margin">
@@ -87,7 +99,7 @@ ed<template>
 </template>
 <script>
 import dispatchTable from './dispatchTable.vue'
-import enterprise from '@/template/enterprise/index.vue'
+import enterprise from './enterprise'
 import logisticcom from '@/template/selectLogisticcom/index.vue'
 import addDisbill from '@/template/logisyticCanUseDisBill/index.vue'
 export default {
@@ -105,7 +117,18 @@ export default {
       dialogAddress:false,
       setcol:24,
       form:{
-        paytype:"到付",
+       "freightamount": "",
+        "logisticno": "",
+        "paytype": "",
+        "remarks": "",
+        "sa_dispatchids": [],
+        "sa_logiscompid": 0,
+        "sa_logisticsid": 0,
+        "sys_enterpriseid": '',
+        "carnum":"",
+        "logisphone":"",
+        "logiscontact":"",
+        "rec_contactsid":'',
         billdate:new Date()
       },
       enterpriseInfo:null,
@@ -138,6 +161,7 @@ export default {
     },
     entRowClick (row) {
       this.enterpriseInfo = row
+      this.form.sys_enterpriseid = row.sys_enterpriseid
     },
     logisticRowClick (row) {
       console.log(row)
@@ -151,26 +175,17 @@ export default {
       this.$refs['dislist'].tableData = unique([...this.$refs['dislist'].tableData,...data],'billno')
     },
     async onSubmit () {
+      this.form.sa_dispatchids = this.$refs['dislist'].tableData.map(e=>{
+        return e.sa_dispatchid
+      })
       const res = await this.$api.requested({
         "id": "202212004124804",
-        "content": {
-          "sa_logisticsid": this.$route.query.id,
-          "sys_enterpriseid": this.enterpriseInfo.sys_enterpriseid,
-          "sa_logiscompid": this.form.sa_logiscompid,
-          "remarks": "",
-          "logisticno": this.form.logisticno,
-          "paytype": this.form.paytype,
-          "billdate":this.form.billdate,
-          "freightamount":this.form.freightamount,
-          "sa_dispatchids":this.$refs['dislist'].tableData.map(e=>{
-            return e.sa_dispatchid
-          }),
-          "rec_contactsid":this.form.rec_contactsid
-        }
+        "content": this.form
       })
       if (Array.isArray(res.data)) {
         this.dialogAddress = true
         this.rec_address = res.data
+        this.$emit('onSuccess')
       } else {
         this.tool.showMessage(res,()=>{
           this.drawer = false

src/HDrpManagement/logistics/modules/enterprise.vue

@@ -0,0 +1,120 @@
+<template>
+  <div>
+    <el-popover
+      placement="bottom"
+      width="100%"
+      v-model="visible">
+      <div>
+        <div class="flex-align-center flex-between" style="margin-bottom:10px">
+          <el-input style="width:200px" suffix-icon="el-icon-search" size="small" v-model="params.content.where.condition" placeholder="输入经销商信息" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" clearable></el-input>
+          <addTemp @onSuccess="onSuccess"></addTemp>
+        </div>
+        <el-table
+          :data="ENlist"
+          size="small"
+          stripe
+          style="width: 100%"
+          height="300"
+          border>
+          <el-table-column
+            prop="enterprisename"
+            :label="qiyi ? '企业名称' : '经销商名称'"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="contact"
+            label="联系人"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="phonenumber"
+            label="联系电话"
+            width="180">
+          </el-table-column>
+          <el-table-column>
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" @click="rowClick(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="params.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+      <el-input readonly :validate-event="false" slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives"  placeholder="输入企业信息" clearable></el-input>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+import addTemp from '@/Form/EnterpriseArchives/add.vue'
+export default {
+  components:{
+    addTemp
+  },
+  props:['type','qiyi'],
+  data () {
+    return {
+      ENlist:[],
+      total:0,
+      currentPage:0,
+      form:{
+        enterprisename:''
+      },
+      params:{
+        "id":20230220150904,
+        "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+                "condition": ""
+            }
+        }
+      },
+      visible:false
+    }
+  },
+  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
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      this.params.content.pageSize = val
+      this.queryEnterpriseArchives()
+    },
+    handleCurrentChange(val) {
+      this.params.content.pageNumber = val
+      this.queryEnterpriseArchives()
+    },
+    rowClick (row) {
+      this.visible = false
+      this.form.enterprisename = row.enterprisename
+      this.$emit('rowClick',row)
+    },
+    onSuccess () {
+      this.queryEnterpriseArchives()
+      this.form.enterprisename = this.ENlist[0].enterprisename
+      this.$emit('rowClick',this.ENlist[0])
+    }
+  },
+  mounted () {
+    // this.queryEnterpriseArchives()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/orderManage/details/index.vue

@@ -129,6 +129,8 @@ export default {
         }
       })
       this.mainData = res.data
+      console.log(this.mainData);
+      
       this.changeDataStructure()
       this.orderreviewtype()
     },

src/HDrpManagement/orderManage/details/tabs/defaultInfo.vue

@@ -3,7 +3,9 @@
     <el-descriptions class="normal-margin" :column="2"  border labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">账户信息</div>
       <el-descriptions-item label="账户名称">{{ mainData.accountclass?mainData.accountclass.accountname:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="账户余额">{{ mainData.balance?mainData.accountclass.balance:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="使用金额">{{ mainData.accountclass?mainData.accountclass.amount:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="是否使用返利金">{{ mainData.accountclass?mainData.accountclass.rebate_used ? '是' : '否' : '--' }}</el-descriptions-item>
+      <el-descriptions-item label="返利金使用金额">{{ mainData.accountclass?mainData.accountclass.rebate_amount:"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">开票信息</div>

src/HDrpManagement/payvoucher/components/enterprise.vue

@@ -63,7 +63,7 @@ export default {
           "pageSize": 20,
           "where": {
             "condition": "",
-            "type":1,//1:经销商，2：客户，3：其他，不传查全部,4:查询项目缔约方，sa_projectid必传
+            // "type":1,//1:经销商，2：客户，3：其他，不传查全部,4:查询项目缔约方，sa_projectid必传
             "sa_projectid":""
           }
         }

src/HManagement/siteManage/systemRemind/components/edit.vue

@@ -0,0 +1,149 @@
+<template>
+  <div>
+    <el-button size="mini" type="text" @click="editBtn">编 辑</el-button>
+    <el-dialog append-to-body :visible.sync="dialogFormVisible" width="600">
+      <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="12">
+            <el-form-item label="提醒名称" prop="remindname">
+              <el-input v-model="form.remindname" placeholder="提醒名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="提醒标题" prop="remindtitle">
+              <el-input v-model="form.remindtitle" placeholder="提醒标题"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="提醒方式" prop="remindmode">
+              <el-select style="width:250px" v-model="form.remindmode" multiple>
+                <el-option label="短信" value="短信"></el-option>
+                <el-option label="邮件" value="邮件"></el-option>
+                <el-option label="弹框" value="弹框"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="提醒内容" prop="content">
+              <el-input type="textarea" v-model="form.content" placeholder="提醒内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注说明" prop="remarks">
+              <el-input type="textarea" v-model="form.remarks" placeholder="备注说明"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="角色权限" prop="isrole">
+              <el-checkbox v-model="form.isrole" :true-label="1" :false-label="0"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="form.isrole">
+            <el-form-item label="角色选择" prop="rolename">
+              <multipleRole ref="role" @onResult="roleResult">
+                <el-input type="text" readonly slot="input" v-model="form.rolename" @focus="$refs.role.drawer=true"></el-input>
+              </multipleRole>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="人员权限" prop="isuser">
+              <el-checkbox v-model="form.isuser" :true-label="1" :false-label="0"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="form.isuser">
+            <el-form-item label="人员选择" prop="username">
+              <multiplePeople ref="user" @onResult="userResult">
+                <el-input type="text" readonly slot="input" v-model="form.username" @focus="$refs.user.drawer=true"></el-input>
+              </multiplePeople>
+            </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>
+import multipleRole from '@/template/multipleRole/index' 
+import multiplePeople from '@/template/multiplePeople/index' 
+export default {
+  name: "add",
+  props:['data'],
+  components:{multipleRole,multiplePeople},
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        sys_remind_configid:0,
+        remindtitle:'',
+        remindmode:[],
+        content:'',
+        isrole:1,
+        roleids:[],
+        rolename:'',
+        isuser:1,
+        userids:[],
+        username:'',
+        issql:1,
+        sqlstr:''
+      },
+      rules:{
+        accountno:[
+          { required: true, message: '输入账户编号', trigger: 'blur'},
+        ],
+        accountname:[
+          { required: true, message: '输入账户名称', trigger: 'blur'}
+        ]
+      }
+    }
+  },
+  methods:{
+    editBtn () {
+      console.log(this.data);
+      
+      this.dialogFormVisible = true
+      this.form = Object.assign({},this.form,this.data)
+      this.form.remindmode = JSON.parse(this.data.remindmode)
+    },
+    onSubmit(){
+      return console.log()
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20221008134703",
+          "version":1,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false
+        })
+      })
+    },
+    /* 角色选择结果 */
+    roleResult (result) {
+      this.form.rolename = result.map(item => item.rolename).join(',')
+      this.form.roleids = result.map(item => item.roleid)
+    },
+    /* 人员选择结果 */
+    userResult (result) {
+      this.form.username = result.map(item => item.name).join(',')
+      this.form.userids = result.map(item => item.userid)
+    }
+  } 
+}
+</script>
+
+<style scoped>
+.dialog-footer {
+  margin-top: 0;
+}
+</style>

src/HManagement/siteManage/systemRemind/index.vue

@@ -0,0 +1,42 @@
+
+<template>
+  <div>
+    <basicLayout 
+      ref="basicLayout" 
+      :oldFormPath="{
+        add:'HManagement/siteManage/systemRemind/components'
+      }"
+      tableName="systemRemindTable" 
+      idName="userid" 
+      :apiId="{query:20221220153101,del:''}"
+      :options="options">
+      <div slot="custom"></div>
+      <template v-slot:tbList="scope">
+        <div>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+        <Edit :data="scope.data.data"/>
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+import Edit from './components/edit'
+export default {
+  data () {
+    return {
+      options:[]
+      
+    }
+  },
+  components: {Edit},
+  methods:{
+  }
+}
+
+</script>
+<style>
+</style>

src/SDrpManagement/agentOrder/details/index.vue

@@ -89,6 +89,8 @@ export default {
         }
       })
       this.mainData = res.data
+      console.log(this.mainData);
+      
       this.changeDataStructure()
     },
     changeDataStructure() {

src/SDrpManagement/agentOrder/details/tabs/defaultInfo.vue

@@ -3,7 +3,9 @@
     <el-descriptions class="normal-margin" :column="2"  border labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">账户信息</div>
       <el-descriptions-item label="账户名称">{{ mainData.accountclass?mainData.accountclass.accountname:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="账户余额">{{ mainData.balance?mainData.accountclass.balance:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="使用金额">{{ mainData.accountclass?mainData.accountclass.amount:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="是否使用返利金">{{ mainData.accountclass?mainData.accountclass.rebate_used ? '是' : '否' : '--' }}</el-descriptions-item>
+      <el-descriptions-item label="返利金使用金额">{{ mainData.accountclass?mainData.accountclass.rebate_amount:"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">开票信息</div>

src/SDrpManagement/agentOrder/index.vue

@@ -11,7 +11,28 @@
       :detailPath="{
         path:'/agent_orderDetails'
       }">
-      <div slot="custom"></div>
+      <div slot="custom" style="display:flex">
+        <div class="label_center">
+          <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-option value="新建" label="新建"></el-option>
+            <el-option value="提交" label="提交"></el-option>
+            <el-option value="审核" label="审核"></el-option>
+            <el-option value="交期待确认" label="交期待确认"></el-option>
+            <el-option value="交期确认" label="交期确认"></el-option>
+            <el-option value="关闭" label="关闭"></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.type = type;$refs.basicLayout.listData()">
+            <el-option value="标准订单" label="标准订单"></el-option>
+            <el-option value="项目订单" label="项目订单"></el-option>
+            <el-option value="促销订单" label="促销订单"></el-option>
+            <el-option value="工具订单" label="工具订单"></el-option>
+          </el-select>
+        </div>
+      </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -43,7 +64,9 @@
 export default {
   data () {
     return {
-      options:[]
+      options:[],
+      status:'',
+      type:''
       
     }
   },

src/SDrpManagement/salerOrder/details/tabs/defaultInfo.vue

@@ -3,7 +3,9 @@
     <el-descriptions class="normal-margin" :column="2"  border labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">账户信息</div>
       <el-descriptions-item label="账户名称">{{ mainData.accountclass?mainData.accountclass.accountname:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="账户余额">{{ mainData.balance?mainData.accountclass.balance:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="使用金额">{{ mainData.accountclass?mainData.accountclass.amount:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="是否使用返利金">{{ mainData.accountclass?mainData.accountclass.rebate_used ? '是' : '否' : '--' }}</el-descriptions-item>
+      <el-descriptions-item label="返利金使用金额">{{ mainData.accountclass?mainData.accountclass.rebate_amount:"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">开票信息</div>

src/router/HManagement.js

@@ -448,6 +448,14 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/siteManage/vacation/index')
+  },{
+    path: '/remindconfig',
+    name: 'remindconfig',
+    meta: {
+      title: '系统提醒设置',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/siteManage/systemRemind/index')
   }, {
     path: '/clue_import',
     name: 'orderclueupload',

src/template/enterprise/index.vue

@@ -18,7 +18,7 @@
           border>
           <el-table-column
             prop="enterprisename"
-            label="经销商名称"
+            :label="qiyi ? '企业名称' : '经销商名称'"
             width="180">
           </el-table-column>
           <el-table-column
@@ -61,7 +61,7 @@ export default {
   components:{
     addTemp
   },
-  props:['type'],
+  props:['type','qiyi'],
   data () {
     return {
       ENlist:[],

src/template/logisyticCanUseDisBill/index.vue

@@ -27,9 +27,24 @@
         label="企业名称">
       </el-table-column>
       <el-table-column
-        prop="logiscomp"
-        label="物流公司">
-      </el-table-column>
+      prop="recheckby"
+      label="收货人">
+    </el-table-column>
+    <el-table-column
+      prop="contactsphonenumber"
+      label="收货人联系电话">
+    </el-table-column>
+    <el-table-column
+      prop="province"
+      label="省市县">
+      <template slot-scope="scope" v-if="scope.row.province">
+        {{`${scope.row.province}-${scope.row.city}-${scope.row.county}`}}
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="address"
+      label="地址">
+    </el-table-column>
     </el-table>
     <div style="margin-top:16px;text-align:right">
       <el-pagination

src/template/multiplePeople/index.vue

@@ -0,0 +1,146 @@
+<template>
+  <div>
+    <el-dialog
+      title="添加人员"
+      :visible.sync="drawer"
+      append-to-body
+      direction="rtl"
+      width="60%">
+      <div class="flex-align-center flex-between " style="margin-top:-10px;margin-bottom: 10px">
+        <div class="flex-align-center">
+          <el-input size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>&nbsp;
+        </div>
+        <el-button type="primary" size="mini" @click="onSbmit" :disabled="selectRowArr.length == 0">批量添加</el-button>
+      </div>
+      <div class="produtMag-panel" style="margin-top: 10px">
+        <el-table
+            @select="selectionChange"
+            border
+            ref="tables"
+            :data="list"
+            style="width: 100%">
+          <el-table-column
+              type="selection"
+              width="42"
+              fixed>
+          </el-table-column>
+          <el-table-column
+              prop="accountno"
+              label="账号">
+          </el-table-column>
+          <el-table-column
+              prop="name"
+              label="账号名称">
+          </el-table-column>
+          <el-table-column
+              prop="phonenumber"
+              label="联系电话">
+          </el-table-column>
+          <el-table-column
+              prop="usertypename"
+              label="用户类型"
+              width="160">
+          </el-table-column>
+        </el-table>
+        <div>
+          <div style="float: left">已选:{{selectTotal}}个角色</div>
+          <div style="margin-top:16px;text-align:right">
+            <el-pagination
+                background
+                small
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                :page-sizes="[20, 50, 100, 200]"
+                layout="total, prev, pager, next, jumper"
+                :total="total">
+            </el-pagination>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  components:{
+  },
+  data () {
+    return {
+      drawer:false,
+      param:{
+        "id": 20221031141102,
+        "content": {
+          "pageSize":20,
+          "pageNumber":1,
+          "isExport":0,
+          "where": {
+            "condition": "",
+          }
+        }
+      },
+      list:[],
+      currentPage:0,
+      selectTotal:0,
+      total:0,
+      selectRowArr:[]
+    }
+  },
+  watch: {
+    data (val) {
+      this.data.forEach((row) => {
+        this.allArr.forEach(item => {
+          if (row == item.userid) {
+            this.$nextTick(() => {
+              this.$refs["tables"].toggleRowSelection(row, true);
+            })
+          }
+        })
+      });    
+    }
+  },
+  methods:{
+    async listData () {
+      this.param.content.sa_salesforecastbillid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      console.log(res.data,"人员列表")
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    selectionChange (arrs,arr) {
+      let index = this.selectRowArr.findIndex(item => item.userid == arr.userid)
+      if (index != -1) {
+        this.selectRowArr.splice(index,1)
+      } else {
+        this.selectRowArr.push(arr)
+      }
+      console.log(this.selectRowArr);
+      
+    },
+    onSbmit () {
+      this.$emit('onResult',this.selectRowArr)
+      this.drawer = false
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/template/multipleRole/index.vue

@@ -0,0 +1,133 @@
+<template>
+  <div>
+    <el-dialog
+      title="添加角色"
+      :visible.sync="drawer"
+      append-to-body
+      direction="rtl"
+      width="60%">
+      <div class="flex-align-center flex-between " style="margin-top:-10px;margin-bottom: 10px">
+        <div class="flex-align-center">
+          <el-input size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>&nbsp;
+        </div>
+        <el-button type="primary" size="mini" @click="onSbmit" :disabled="selectRowArr.length == 0">批量添加</el-button>
+      </div>
+      <div class="produtMag-panel" style="margin-top: 10px">
+        <el-table
+            @select="selectionChange"
+            border
+            ref="multipleTable"
+            :data="list"
+            style="width: 100%">
+          <el-table-column
+              type="selection"
+              width="42"
+              fixed>
+          </el-table-column>
+          <el-table-column
+              prop="rolename"
+              label="角色名称">
+          </el-table-column>
+          <el-table-column
+              prop="remarks"
+              label="角色描述">
+          </el-table-column>
+          <el-table-column
+              prop="createby"
+              label="创建人">
+          </el-table-column>
+          <el-table-column
+              prop="createdate"
+              label="创建时间"
+              width="160">
+          </el-table-column>
+        </el-table>
+        <div>
+          <div style="float: left">已选:{{selectTotal}}个角色</div>
+          <div style="margin-top:16px;text-align:right">
+            <el-pagination
+                background
+                small
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                :page-sizes="[20, 50, 100, 200]"
+                layout="total, prev, pager, next, jumper"
+                :total="total">
+            </el-pagination>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils'
+export default {
+  props:[],
+  components:{
+  },
+  data () {
+    return {
+      drawer:false,
+      param:{
+        "id": 20221101131902,
+        "content": {
+          "pageSize":20,
+          "pageNumber":1,
+          "where": {
+            "condition": "",
+          }
+        }
+      },
+      list:[],
+      currentPage:0,
+      selectTotal:0,
+      total:0,
+      selectRowArr:[]
+    }
+  },
+  methods:{
+    async listData () {
+      this.param.content.sa_salesforecastbillid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      console.log(res.data,"角色列表")
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    selectionChange (arrs,arr) {
+      let index = this.selectRowArr.findIndex(item => item.roleid == arr.roleid)
+      if (index != -1) {
+        this.selectRowArr.splice(index,1)
+      } else {
+        this.selectRowArr.push(arr)
+      }
+      console.log(this.selectRowArr);
+      
+    },
+    onSbmit () {
+      this.$emit('onResult',this.selectRowArr)
+      this.drawer = false
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/template/selectProduct/index.vue

@@ -119,6 +119,7 @@ import uploadFile from '@/components/upload/hw_obs_upload'
 import previewImage from '@/components/previewImage/index'
 
 export default {
+  props:['productData'],
   data () {
     return {
       params:{
@@ -172,6 +173,9 @@ export default {
     }
   },
   mounted () {
+  },
+  created () {
+    if (this.productData) this.tableData = this.productData
   }
 }