1

src/Form/payvoucher/add.vue

@@ -140,6 +140,8 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.onClose()
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/payvoucherDetails',query:{id:res.data.sa_cashbillid,rowindex:res.data.rowindex}})
         })
       })
     },

src/Form/recvoucher/add.vue

@@ -140,6 +140,8 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.onClose()
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/recvoucherDetails',query:{id:res.data.sa_cashbillid,rowindex:res.data.rowindex}})
         })
       })
     },

src/HDrpManagement/ProductMag/detail/index.vue

@@ -44,22 +44,22 @@
           message="确认上架当前商品吗?"
           idName="20220923154802"
           keyName="itemids"
-          :id="[$route.query.id]"
+          :id="$route.query.id"
           :paramData="[{key:'isonsale',value:1}]"
           @onSuccess="queryMainData($route.query.id)"
           class="inline-16"
-          v-if="tool.checkAuth($route.name,'isTop') && mainData.isonsale == 0 && mainData.status == '新建'"
+          v-if="tool.checkAuth($route.name,'isTop') && mainData.isonsale == 0 && mainData.status == '审核'"
         />
         <customBtn 
           btnName="下架"
           message="确认下架当前商品吗?"
           idName="20220923154802"
           keyName="itemids"
-          :id="[$route.query.id]"
+          :id="$route.query.id"
           :paramData="[{key:'isonsale',value:0}]"
           @onSuccess="queryMainData($route.query.id)"
           class="inline-16"
-          v-if="tool.checkAuth($route.name,'isBottom') && mainData.isonsale == 1 &&  mainData.status == '新建'"
+          v-if="tool.checkAuth($route.name,'isBottom') && mainData.isonsale == 1"
         />
       </div>
       <div slot="slot0" >

src/HDrpManagement/dispatch/details/index.vue

@@ -74,10 +74,6 @@ import defaultInfo from '../modules/defaultInfo.vue'
             label:'发货日期',
             value:this.mainData.billdate
           },
-          {
-            label:'品牌',
-            value:this.mainData.brandname
-          },
           {
             label:'经销商编号',
             value:this.mainData.agentnum

src/HDrpManagement/dispatch/modules/defaultInfo.vue

@@ -5,7 +5,6 @@
       <el-descriptions-item label="发货单号">{{ mainData.billno?mainData.billno:"--" }}</el-descriptions-item>
       <el-descriptions-item label="订单号">{{ mainData.sonum?mainData.sonum:"--" }}</el-descriptions-item>
       <el-descriptions-item label="发货日期">{{ mainData.billdate?mainData.billdate:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="品牌">{{ mainData.brandname?mainData.brandname:"--" }}</el-descriptions-item>
       <el-descriptions-item label="经销商编号">{{ mainData.agentnum?mainData.agentnum:"--" }}</el-descriptions-item>
       <el-descriptions-item label="经销商名称">{{ mainData.enterprisename?mainData.enterprisename:"--" }}</el-descriptions-item>
       <el-descriptions-item :style="style(mainData.STATUS)" label="状态">
@@ -15,10 +14,10 @@
     </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.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-item label="联系人">{{ mainData.recvice?mainData.recvice.name:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="联系人电话">{{ mainData.recvice?mainData.recvice.phonenumber:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="省市县">{{mainData.recvice ? `${mainData.recvice.province}-${mainData.recvice.city}-${mainData.recvice.county}` : '' }}</el-descriptions-item>
+      <el-descriptions-item label="地址">{{ mainData.recvice ? mainData.recvice.address : ''}}</el-descriptions-item>
     </el-descriptions>
     <!-- <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content"> -->
       <!-- <div slot="title" class="my-label__title">物流信息</div> -->

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/index.vue

@@ -2,9 +2,9 @@
   <div>
     <el-button-group v-if="tool.checkAuth($route.name,'editBlueInvioce')" style="margin-bottom:10px">
       <el-button size="small" type="primary" :disabled="status !== '新建'" @click="addInvoiceapp">一键添加发票</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 && status != '审核'" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
       <el-button size="small" type="primary" :disabled="selectData.length === 0" @click="clickInvioceQuery">发票创建查询</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0" @click="blueInvioceToRed">红冲勾选行</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 &&  status != '审核'" @click="blueInvioceToRed">红冲勾选行</el-button>
     </el-button-group>
     <invoiceTable :status="status" ref="invoiceTable" @activeRow="activeRow" @selection="selection"></invoiceTable>
     <invoiceTablemx :status="status" ref="invoiceTablemx" @onSuccess="mxOnSuccess"></invoiceTablemx>

src/HDrpManagement/invoiceapp/detail/tab/redInvoice/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button-group v-if="tool.checkAuth($route.name,'editBlueInvioce')" style="margin-bottom:10px">
-      <el-button size="small" type="primary" :disabled="selectData.length === 0" @click="clickCreateRedInvioce">勾选创建发票</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 && status != '审核'" @click="clickCreateRedInvioce">勾选创建发票</el-button>
       <el-button size="small" type="primary" :disabled="selectData.length === 0" @click="clickInvioceQuery">发票创建查询</el-button>
     </el-button-group>
     <invoiceTable :status="status" ref="invoiceTable" @activeRow="activeRow" @selection="selection"></invoiceTable>

src/HDrpManagement/orderManage/details/index.vue

@@ -218,6 +218,10 @@ export default {
           label:'备注',
           value:this.mainData.remarks
         },
+        {
+          label:'返利金使用比例(%)',
+          value:this.mainData.rebate_userate
+        },
         {
           label:'退回原因',
           value:this.mainData.backreason

src/HDrpManagement/orderManage/index.vue

@@ -78,9 +78,11 @@
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'ischange'">
+          {{scope.data.column.data.ischange}}
           {{ scope.data.column.data.ischange ? '是' : '否' }}
         </div>
         <div v-else-if="scope.data.column.columnname == 'isreturn'">
+          {{scope.data.column.data.isreturn}}
           {{ scope.data.column.data.isreturn ? '是' : '否' }}
         </div>
         <div v-else>

src/HDrpManagement/serveBill/components/add.vue

@@ -202,6 +202,8 @@ export default {
           this.$emit('onSuccess')
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/serveBillDetail',query:{id:res.data.sa_serviceorderid,rowindex:res.data.rowindex}})
         })
       })
     },

src/HManagement/EnterpriseArchives/modules/details.vue

@@ -86,6 +86,18 @@ export default {
           label:'税号',
           value: this.mainData.taxno
         },
+        {
+          label:'免运费金额',
+          value: this.mainData.freefreightamount
+        },
+        {
+          label:'订单可退货天数',
+          value: this.mainData.limitreturnday
+        },
+        {
+          label:'是否订单审核可开票',
+          value: this.mainData.invoicingpoint == '1' ? '订单审核' : '发货'
+        },
         {
           label:'创建人',
           value: this.mainData.createby

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">
@@ -61,10 +61,10 @@
       </tableLayout>
     </div>
     <div slot="slot1">
-      <salescope :data="mainData"></salescope>
+      <SaleClass :data="mainData"></SaleClass>
     </div>
     <div slot="slot2">
-      <SaleClass :data="mainData"></SaleClass>
+      <field :data="mainData"></field>
     </div>
     <div slot="slot3">
       <accountMoney :mainData="mainData"></accountMoney>
@@ -73,30 +73,30 @@
       <agent-address :mainData="mainData"></agent-address>
     </div>
     <div slot="slot5">
-      <agent-contact :mainData="mainData"></agent-contact>
+      <financial :mainData="mainData"></financial>
     </div>
     <div slot="slot6">
-      <financial :mainData="mainData"></financial>
+       <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>
     <div slot="slot7" >
       <contract :data="mainData"></contract>
     </div>
     <div slot="slot8"  >
-      <achievementTarget :data="mainData"></achievementTarget>
+      <agent-contact :mainData="mainData"></agent-contact>
     </div>
     <div slot="slot9">
-      <field :data="mainData"></field>
+      <achievementTarget :data="mainData"></achievementTarget>
     </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>
+      <salescope :data="mainData"></salescope>
     </div>
   </basicDetails>
 </template>
@@ -220,6 +220,18 @@ export default {
           label:'税号',
           value: this.mainData.taxno
         },
+        {
+          label:'免运费金额',
+          value: this.mainData.freefreightamount
+        },
+        {
+          label:'订单可退货天数',
+          value: this.mainData.limitreturnday
+        },
+        {
+          label:'是否订单审核可开票',
+          value: this.mainData.invoicingpoint == '1' ? '订单审核' : '发货'
+        },
         {
           label:'创建人',
           value: this.mainData.createby

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

@@ -43,8 +43,8 @@
           </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 ref="role" :data="form" @onResult="roleResult">
+                <el-input type="text" readonly slot="input" v-model="form.rolename" @focus="$refs.role.drawer=true;$refs.role.normalSetId()"></el-input>
               </multipleRole>
             </el-form-item>
           </el-col>
@@ -55,8 +55,8 @@
           </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 :data="form" ref="user" @onResult="userResult">
+                <el-input type="text" readonly slot="input" v-model="form.username" @focus="$refs.user.drawer=true;$refs.user.normalSetId()"></el-input>
               </multiplePeople>
             </el-form-item>
           </el-col>
@@ -106,10 +106,10 @@ export default {
   },
   methods:{
     editBtn () {
-      console.log(this.data);
-      
       this.dialogFormVisible = true
       this.form = Object.assign({},this.form,this.data)
+      this.form.rolename = Object.values(this.form.rolemsg).join(',')
+      this.form.username = Object.values(this.form.usermsg).join(',')
     },
     onSubmit(){
       this.$refs['form'].validate(async (valid) => {
@@ -129,12 +129,19 @@ export default {
     /* 角色选择结果 */
     roleResult (result) {
       this.form.rolename = result.map(item => item.rolename).join(',')
+      this.form.rolemsg = result.map(item => item.rolename)
       this.form.roleids = result.map(item => item.roleid)
+      console.log(this.form.rolemsg);
+      
     },
     /* 人员选择结果 */
     userResult (result) {
+      console.log(result);
+      
       this.form.username = result.map(item => item.name).join(',')
       this.form.userids = result.map(item => item.userid)
+      console.log(this.form.username,this.form.userids);
+      
     }
   } 
 }

src/SDrpManagement/Products/modules/Select.vue

@@ -76,7 +76,7 @@ export default {
 
     async queryClass () {
       const res = await this.$api.requested({
-        "id":"20220922110403","content":{"sa_brandid":this.brand_act,where:{istool:1}}
+        "id":"20220922110403","content":{"sa_brandid":this.brand_act,where:{istool:0}}
       })
       console.log(res.data,'pop')
       this.itemclass = res.data[0].ttemclass
@@ -109,6 +109,7 @@ export default {
     }
   },
   mounted () {
+    this.queryClass()
     this.queryAgentiInfo()
     this.queryBrands()
   }

src/SDrpManagement/agentOrder/details/index.vue

@@ -3,7 +3,6 @@
     <basicDetails
         ref="details"
         :titleText="`${mainData.sonum}`"
-        :oldFormPath="{edit:'SDrpManagement/agentOrder/modules'}"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20221224180302"
@@ -16,6 +15,7 @@
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation" class="inline-16">
+          <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData" />
           <el-button :disabled="mainData.status !== '交期待确认'"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
           <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
           <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
@@ -56,6 +56,7 @@
 </template>
 
 <script>
+import Edit from '../modules/edit'
 import defaultInfo from './tabs/defaultInfo.vue';
 import productList from '../modules/productlist.vue'
 import rebat from './tabs/rebatesettlement.vue'
@@ -76,6 +77,7 @@ export default {
     }
   },
   components:{
+    Edit,
     defaultInfo,
     productList,
     rebat,

src/SDrpManagement/sinvoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <addmx class="mt-10" :sa_invoicebillid="param.content.sa_invoicebillid" :status="status" @onSuccess="listData(param.content.sa_invoicebillid)"></addmx>
+    <!-- <addmx class="mt-10" :sa_invoicebillid="param.content.sa_invoicebillid" :status="status" @onSuccess="listData(param.content.sa_invoicebillid)"></addmx> -->
     <el-table
       :data="list"
       style="width: 100%"

src/template/multiplePeople/index.vue

@@ -10,7 +10,7 @@
         <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>
+        <el-button type="primary" size="mini" @click="onSbmit" :disabled="selectRowId.length == 0">批量添加</el-button>
       </div>
       <div class="produtMag-panel" style="margin-top: 10px">
         <el-table
@@ -43,7 +43,7 @@
           </el-table-column>
         </el-table>
         <div>
-          <div style="float: left">已选:{{selectTotal}}个角色</div>
+          <div style="float: left">已选:{{selectRowId.length}}个人员</div>
           <div style="margin-top:16px;text-align:right">
             <el-pagination
                 background
@@ -51,7 +51,7 @@
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
                 :current-page="currentPage"
-                :page-sizes="[20, 50, 100, 200]"
+                :page-size="param.content.pageSize"
                 layout="total, prev, pager, next, jumper"
                 :total="total">
             </el-pagination>
@@ -76,7 +76,6 @@ export default {
         "content": {
           "pageSize":20,
           "pageNumber":1,
-          "isExport":0,
           "where": {
             "condition": "",
           }
@@ -84,23 +83,23 @@ export default {
       },
       list:[],
       currentPage:0,
-      selectTotal:0,
       total:0,
-      selectRowArr:[]
+      selectRowId:[],
+      selectAllData:[]
     }
   },
   watch: {
-    data (val) {
-      this.data.forEach((row) => {
-        this.allArr.forEach(item => {
-          if (row == item.userid) {
+    list (val) {
+      this.list.forEach((row) => {
+        this.selectRowId.forEach(item => {
+          if (row.userid == item) {
             this.$nextTick(() => {
               this.$refs["tables"].toggleRowSelection(row, true);
             })
           }
         })
       });    
-    }
+    },
   },
   methods:{
     async listData () {
@@ -112,17 +111,29 @@ export default {
       this.currentPage = res.pageNumber
     },
     selectionChange (arrs,arr) {
-      let index = this.selectRowArr.findIndex(item => item.userid == arr.userid)
+      let index = this.selectRowId.findIndex(item => item == arr.userid)
       if (index != -1) {
-        this.selectRowArr.splice(index,1)
+        this.selectAllData.splice(index,1)
+        this.selectRowId.splice(index,1)
       } else {
-        this.selectRowArr.push(arr)
+        this.selectRowId.push(arr.userid)
+        this.selectAllData.push(arr)
       }
-      console.log(this.selectRowArr);
+    },
+    normalSetId () {
+      this.listData()
+      this.selectAllData = this.data.userids.map(item => {
+        return {
+          userid: item,
+          name: this.data.usermsg[item]
+        }
+      })
+      console.log(this.selectAllData);
       
+      this.selectRowId = this.data.userids
     },
     onSbmit () {
-      this.$emit('onResult',this.selectRowArr)
+      this.$emit('onResult',this.selectAllData)
       this.drawer = false
     },
     handleSizeChange(val) {
@@ -137,10 +148,9 @@ export default {
     },
   },
   mounted () {
-    this.listData()
   }
 }
 
 </script>
 <style>
-</style>
+</style>

src/template/multipleRole/index.vue

@@ -16,7 +16,7 @@
         <el-table
             @select="selectionChange"
             border
-            ref="multipleTable"
+            ref="tables"
             :data="list"
             style="width: 100%">
           <el-table-column
@@ -43,7 +43,7 @@
           </el-table-column>
         </el-table>
         <div>
-          <div style="float: left">已选:{{selectTotal}}个角色</div>
+          <div style="float: left">已选:{{selectRowId.length}}个角色</div>
           <div style="margin-top:16px;text-align:right">
             <el-pagination
                 background
@@ -51,7 +51,7 @@
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
                 :current-page="currentPage"
-                :page-sizes="[20, 50, 100, 200]"
+                :page-size="param.content.pageSize"
                 layout="total, prev, pager, next, jumper"
                 :total="total">
             </el-pagination>
@@ -83,16 +83,16 @@ export default {
       },
       list:[],
       currentPage:0,
-      selectTotal:0,
       total:0,
-      selectRowId:[]
+      selectRowId:[],
+      selectAllData:[]
     }
   },
   watch: {
     list (val) {
       this.list.forEach((row) => {
         this.selectRowId.forEach(item => {
-          if (row[this.idName] == item[this.idName]) {
+          if (row.roleid == item) {
             this.$nextTick(() => {
               this.$refs["tables"].toggleRowSelection(row, true);
             })
@@ -113,15 +113,27 @@ export default {
     selectionChange (arrs,arr) {
       let index = this.selectRowId.findIndex(item => item == arr.roleid)
       if (index != -1) {
+        this.selectAllData.splice(index,1)
         this.selectRowId.splice(index,1)
       } else {
         this.selectRowId.push(arr.roleid)
+        this.selectAllData.push(arr)
       }
-      console.log(this.selectRowId);
+    },
+    normalSetId () {
+      this.listData()
+      this.selectAllData = this.data.roleids.map(item => {
+        return {
+          roleid: item,
+          rolename: this.data.rolemsg[item]
+        }
+      })
+      console.log(this.selectAllData);
       
+      this.selectRowId = this.data.roleids
     },
     onSbmit () {
-      this.$emit('onResult',this.selectRowId)
+      this.$emit('onResult',this.selectAllData)
       this.drawer = false
     },
     handleSizeChange(val) {
@@ -136,10 +148,9 @@ export default {
     },
   },
   mounted () {
-    this.listData()
   }
 }
 
 </script>
 <style>
-</style>
+</style>

src/template/orderCanUseContract/index.vue

@@ -1,6 +1,14 @@
 <template>
   <div>
     <div style="margin-top:16px;text-align:right">
+      <div class="flex-align-center flex-between mt-10">
+        <el-input 
+          style="width:200px" 
+          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>
+      </div>
       <el-table
       :data="tableData"
       style="width: 100%"