Merge branch 'mergeBranch' into redUrgent

src/Form/marketing2/agent/add.vue

@@ -344,6 +344,12 @@ export default {
       }
     },
     chooseEnterprise (item) {
+      this.form.erpagentnum = item.erpagentnum
+      this.form.grade = item.grade
+      this.form.limitreturnday = item.limitreturnday
+      this.form.invoicingpoint = item.invoicingpoint
+      this.form.saleclassauth = item.saleclassauth
+      this.radio = item.freefreightamount
       this.visible = false
       this.form.enterprisename = item.enterprisename
       this.form.sys_enterpriseid = item.sys_enterpriseid

src/HDrpManagement/ProductMag/modules/addClass.vue

@@ -2,6 +2,8 @@
   <div>
     <el-button type="primary" size="small" @click="dialogFormVisible=true" >设置分类</el-button>
     <el-dialog append-to-body title="设置分类" :visible.sync="dialogFormVisible" width="900px">
+      <el-input style="width:200px;" placeholder="搜索" :suffix-icon="condition?condition.length > 0?'':'':'el-icon-search'" v-model="condition" @keyup.native.enter="getClassList()" @clear="getClassList" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+      </el-input>
       <el-table
         :data="classList"
         stripe
@@ -53,7 +55,8 @@ export default {
       disabledId:[],
       tableList:[],
       tablecols:[],
-      result:[]
+      result:[],
+      condition:''
     }
   },
   methods:{
@@ -89,12 +92,12 @@ export default {
     async getClassList () {
       let res = await this.$api.requested({
           "id": "20230325141103",
-          "version":1,
           "content": {
             "sa_brandid":0,
             "itemid": this.$route.query.id,
             "where": {
-              istool: this.data.data.istool ? 1 : 0
+              istool: this.data.data.istool ? 1 : 0,
+              condition:this.condition
             }
           }
       })
@@ -120,7 +123,7 @@ export default {
     //     }
     //     if (node.subdep && node.subdep.length > 0) {
     //       for (let index = 0; index < node.subdep.length; index++) {
-    //         elNode.children.push(createNodes(node.subdep[index]))            
+    //         elNode.children.push(createNodes(node.subdep[index]))
     //       }
     //     }
     //     return elNode
@@ -143,7 +146,7 @@ export default {
         }
         if (node.subdep && node.subdep.length > 0) {
           for (let index = 0; index < node.subdep.length; index++) {
-            elNode.children.push(createNodes(node.subdep[index]))            
+            elNode.children.push(createNodes(node.subdep[index]))
           }
         }
         return elNode
@@ -167,4 +170,4 @@ export default {
 /deep/.el-dialog__body {
   padding-bottom: 0 !important;
 }
-</style>
+</style>

src/HDrpManagement/afterSalesmag/modules/productDetail/add.vue

@@ -5,9 +5,9 @@
       <div slot="title" style="font-size: 15px">
         添加商品
       </div>
-      <div class="drawer__panel">
+      <div class="drawer__panel" style="margin-bottom: 0 !important;">
         <el-input style="width:250px;margin-bottom:10px" size="small" placeholder="请输入搜索内容" clearable @clear="getOrderList(params.content.pageNumber=1)" v-model="params.content.where.condition" @keyup.enter.native="getOrderList(params.content.pageNumber=1)"></el-input>
-        <selectTable @selectChange="selectChange" v-if="dialogFormVisible" idName="sa_orderitemsid" ref="table" v-model="result" :layout="tablecols" :data="orderList" :custom="true" height="500px"  @upDateData="upDateData">
+        <selectTable @selectChange="selectChange" v-if="dialogFormVisible" idName="sa_orderitemsid" ref="table" v-model="result" :layout="tablecols" :data="orderList" :custom="true" height="calc(100vh - 251px)"  @upDateData="upDateData">
            <template v-slot:customcol="scope">
               <div>{{scope.column.data[scope.column.columnname]}}</div>
             </template>
@@ -118,11 +118,11 @@ export default {
       this.params.content.sa_aftersalesmagid = this.data.sa_aftersalesmagid
       let res = await this.$api.requested(this.params)
       console.log(res.data);
-      
+
       this.orderList = res.data
       this.total = res.total
       console.log(res);
-      
+
     },
     selectChange (data) {
       this.selectArr = data
@@ -153,4 +153,4 @@ export default {
 .el-select {
   width: 100%;
 }
-</style>
+</style>

src/HDrpManagement/aftersalesBill/modules/productDetail/add.vue

@@ -5,9 +5,9 @@
       <div slot="title" style="font-size: 15px">
         添加商品
       </div>
-      <div class="drawer__panel">
+      <div class="drawer__panel" style="margin-bottom: 0 !important;">
         <el-input style="width:250px;margin-bottom:10px" size="small" placeholder="请输入搜索内容" clearable @clear="getOrderList(params.content.pageNumber=1)" v-model="params.content.where.condition" @keyup.enter.native="getOrderList(params.content.pageNumber=1)"></el-input>
-        <selectTable @selectChange="selectChange" v-if="dialogFormVisible" idName="sa_orderitemsid" ref="table" v-model="result" :layout="tablecols" :data="orderList" :custom="true" height="500px"  @upDateData="upDateData">
+        <selectTable @selectChange="selectChange" v-if="dialogFormVisible" idName="sa_orderitemsid" ref="table" v-model="result" :layout="tablecols" :data="orderList" :custom="true" height="calc(100vh - 251px)"  @upDateData="upDateData">
            <template v-slot:customcol="scope">
               <div>{{scope.column.data[scope.column.columnname]}}</div>
             </template>
@@ -118,15 +118,15 @@ export default {
       this.params.content.sa_aftersalesmagid = this.data.sa_aftersalesmagid
       let res = await this.$api.requested(this.params)
       console.log(res.data);
-      
+
       this.orderList = res.data
       this.total = res.total
       console.log(res);
-      
+
     },
     selectChange (data) {
       console.log(data);
-      
+
       this.selectArr = data
       this.isLength = data.length < 1
     },
@@ -155,4 +155,4 @@ export default {
 .el-select {
   width: 100%;
 }
-</style>
+</style>

src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -39,9 +39,10 @@
             </div>
             <el-button class="inline-16" v-if="tool.checkAuth($route.name,'examine')"  :disabled="mainData.status !== '提交' && mainData.status !== '交期确认'" type="primary" size="mini" slot="reference">审 核</el-button>
           </el-popover> -->
-          <el-button v-if="tool.checkAuth($route.name,'examine')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="onReturnCheck">反审核</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'reback') && mainData.status == '提交'"  type="primary" size="mini" @click="dialogVisible = true">退 回</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,'examine')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="onReturnCheck" >反审核</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'reback') && mainData.status == '提交'"  type="primary" size="mini" @click="dialogVisible = true" >退 回</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')" class="inline-16">提 交</el-button>
+          <copyTo  :sa_orderid="mainData.sa_orderid" path="/toolBorrowingMagDetail" class="inline-16" style="margin-right: 0px!important;"></copyTo>
           <!-- <el-button v-if="tool.checkAuth($route.name,'close')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="closeOrder">关 闭</el-button> -->
           <!-- <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button> -->
       </div>
@@ -80,6 +81,7 @@ import revenue from './tabs/revenueAndExp.vue'
 import Edit from '../modules/edit'
 import erpHistory from './tabs/erpHistory.vue'
 import Check from '../modules/check'
+import copyTo from '@/template/copyTo/index'
 
 export default {
   name: "detail",
@@ -107,7 +109,8 @@ export default {
     revenue,
     Edit,
     erpHistory,
-    Check
+    Check,
+    copyTo
   },
   methods:{
     async orderreviewtype () {
@@ -188,7 +191,7 @@ export default {
         },
         {
           label:'审核日期',
-          value:this.mainData.checkdate
+          value:this.mainData.checkdate?this.mainData.checkdate:'--'
         },
         {
           label:'收货人',
@@ -241,7 +244,7 @@ export default {
         this.$message({
           type: 'info',
           message: '取消提交'
-        });          
+        });
       });
     },
     // 反审核订单
@@ -264,7 +267,7 @@ export default {
         this.$message({
           type: 'info',
           message: err
-        });          
+        });
       });
     },
     async onRebanck () {
@@ -328,4 +331,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SDrpManagement/QuotedPrice/detail/components/copyTo.vue

@@ -42,7 +42,15 @@ export default {
         "id": 20221209094103,
       })
       this.saQuotedPriceData = res.data
-      this.copyList()
+      if (res.code == 0){
+        this.$notify.error({
+          title: res.data,
+          message: res.msg
+        });
+      }else {
+        this.copyList()
+      }
+
     },
     copyList(){
       this.$store.dispatch('changeDetailDrawer',false)
@@ -77,4 +85,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SDrpManagement/salerToolBorrowing/detail/index.vue

@@ -16,7 +16,8 @@
       @onEditSuccess="onEditSuccess">
       <div slot="customOperation" class="inline-16">
           <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :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,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')" class="inline-16">提 交</el-button>
+          <copyTo  :sa_orderid="mainData.sa_orderid" path="/toolBorrowing_salerDetail" class="inline-16" style="margin-right: 0px!important;"></copyTo>
       </div>
       <div slot="slot0" >
         <toolList ref="tool" type="edit" @onSuccess="queryMainData" :data="mainData" @queryDetail="queryMainData" @closeTool="onEditSuccess"></toolList>
@@ -30,6 +31,7 @@
 <script>
 import toolList from './tabs/toolList.vue'
 import confirmDate from '../modules/confirmDate.vue'
+import copyTo from '@/template/copyTo/index'
 import {mapGetters} from "vuex";
 
 export default {
@@ -44,11 +46,12 @@ export default {
   },
   components:{
     toolList,
-    confirmDate
+    confirmDate,
+    copyTo
   },
   provide () {
     return {
-      thisDetail:()=> this 
+      thisDetail:()=> this
     }
   },
   methods:{
@@ -128,7 +131,7 @@ export default {
         },
         {
           label:'审核日期',
-          value:this.mainData.checkdate
+          value:this.mainData.checkdate?this.mainData.checkdate:'--'
         },
         {
           label:'收货人',
@@ -181,7 +184,7 @@ export default {
         this.$message({
           type: 'info',
           message: '取消'
-        });          
+        });
       });
     },
     async confirmdate () {
@@ -206,4 +209,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SDrpManagement/toolBorrowing/detail/index.vue

@@ -16,7 +16,8 @@
       <div slot="customOperation" class="inline-16">
         <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.tool.listData()"/>
         <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :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,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')" class="inline-16">提 交</el-button>
+        <copyTo  :sa_orderid="mainData.sa_orderid" path="/toolBorrowingDetail" class="inline-16" style="margin-right: 0px!important;"></copyTo>
       </div>
       <div slot="slot0" >
         <toolList ref="tool" type="edit" @onSuccess="queryMainData" :data="mainData" @queryDetail="queryMainData"></toolList>
@@ -31,6 +32,7 @@
 import toolList from './tabs/toolList.vue'
 import confirmDate from '../modules/confirmDate.vue'
 import Edit from '../modules/edit'
+import copyTo from '@/template/copyTo/index'
 
 export default {
   name: "detail",
@@ -45,11 +47,12 @@ export default {
   components:{
     Edit,
     toolList,
-    confirmDate
+    confirmDate,
+    copyTo
   },
   provide () {
     return {
-      thisDetail:()=> this 
+      thisDetail:()=> this
     }
   },
   methods:{
@@ -71,7 +74,7 @@ export default {
       })
       this.mainData = res.data
       console.log(this.mainData);
-      
+
       this.changeDataStructure()
       this.orderreviewtype()
     },
@@ -130,7 +133,7 @@ export default {
         },
         {
           label:'审核日期',
-          value:this.mainData.checkdate
+          value:this.mainData.checkdate?this.mainData.checkdate:'--'
         },
         {
           label:'收货人',
@@ -178,7 +181,7 @@ export default {
         this.$message({
           type: 'info',
           message: '取消'
-        });          
+        });
       });
     },
     async confirmdate () {
@@ -203,4 +206,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/template/copyTo/index.vue

@@ -0,0 +1,50 @@
+<template>
+  <div>
+    <el-button  size="mini" type="primary" @click="copyData">复 制</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  props:["path",'sa_orderid'],
+  data(){
+    return {
+      param:{
+        "id": "20240315131202",
+        "content": {
+          "sa_orderid":''
+        }
+      }
+    }
+  },
+  methods:{
+    async copyData(){
+      this.param.content.sa_orderid = this.sa_orderid
+      const res = await this.$api.requested(this.param)
+      if (res.code == 0){
+        this.$message.error(res.msg);
+      }else {
+        this.copyPath(res.data)
+      }
+
+    },
+    copyPath(item){
+      this.$store.dispatch('changeDetailDrawer',false)
+      setTimeout(()=>{
+        this.$router.replace({
+          path:this.path,
+          query:{
+            id:item.sa_orderid
+          }
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+      },500)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>