Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

# Conflicts:
#	src/SDrpManagement/toolBorrowing/modules/add.vue
#	vue.config.js

src/HDrpManagement/AccountMoney/index.vue

@@ -82,7 +82,8 @@ export default {
   },
   methods:{
     list (param) {
-      param.content.sys_enterpiseid = JSON.parse(window.sessionStorage.getItem('accountinfo')).enterprise.sys_enterpriseid
+      param.content.type = 0
+      // param.content.sys_enterpiseid = JSON.parse(window.sessionStorage.getItem('accountinfo')).enterprise.sys_enterpriseid
     },
     /** 获取公司数据 */
     async getEnterprise () {

src/HDrpManagement/AccountMoney/modules/detail.vue

@@ -69,7 +69,6 @@ export default {
   },
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name)['accountMoneyDetailTable'].tablecols
-    this.getList()
   },
   methods: {
     editBtn () {

src/HDrpManagement/logistics/details/index.vue

@@ -17,8 +17,8 @@
         </div>
         <div slot="customOperation" >
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="queryMainData(),$refs.dispatch.listData()"/>
-          <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status !== '收货'" @click="onConfimRec">确认收货</el-button>
-          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status !== '收货'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
+          <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status == '收货'" @click="onConfimRec">确认收货</el-button>
+          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status != '新建'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
         </div>
         <div slot="slot0" >
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>
@@ -28,8 +28,8 @@
           <dismx ref="dismx"></dismx>
         </div>
         <div  slot="slot2">
-          <addBox v-if="tool.checkAuth($route.name,'boxInfo')" class="mt-10" @onSuccess="onBoxSuccess"></addBox>
-          <boxlist v-if="tool.checkAuth($route.name,'addBoxInfo')" ref="boxlist"></boxlist>
+          <addBox v-if="tool.checkAuth($route.name,'addBoxInfo')" class="mt-10" @onSuccess="onBoxSuccess"></addBox>
+          <boxlist v-if="tool.checkAuth($route.name,'boxInfo')" ref="boxlist"></boxlist>
           <el-empty description="暂无查询权限" v-else></el-empty>
         </div>
         <div  slot="slot3">

src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -24,11 +24,11 @@
       label="企业名称">
     </el-table-column>
     <el-table-column
-      prop="recheckby"
+      prop="name"
       label="收货人">
     </el-table-column>
     <el-table-column
-      prop="contactsphonenumber"
+      prop="phonenumber"
       label="收货人联系电话">
     </el-table-column>
     <el-table-column
@@ -100,6 +100,8 @@
         })
         if(res.data.length > 0) this.$emit('onInit',res.data[0]);
         this.tableData = res.data
+        console.log(this.tableData);
+        
         res.data.length > 0?this.rowClick(res.data[0]):''
       },
       rowClick (row) {

src/HDrpManagement/orderManage/details/index.vue

@@ -23,7 +23,8 @@
           <confirmDate v-if="tool.checkAuth($route.name,'replyDate')" class="inline-16" :data="mainData" @onSuccess="queryMainData"></confirmDate>
           <el-popover
             placement="top"
-            v-model="visible">
+            v-model="visible"
+            trigger="click">
             <p  class="mt-10 normal-title">选择评审类型</p>
             <el-select class="mt-10" v-model="value" placeholder="请选择" size="mini">
               <el-option
@@ -37,7 +38,7 @@
               <el-button size="mini" type="text" @click="visible = false">取消</el-button>
               <el-button  type="primary" size="mini" @click="onSubmit('审核')">确定</el-button>
             </div>
-            <el-button class="inline-16" v-if="tool.checkAuth($route.name,'examine') && mainData.status === '提交' && mainData.status === '交期确认'"   type="primary" size="mini" slot="reference">审 核</el-button>
+            <el-button class="inline-16" @click="visible=true" v-if="tool.checkAuth($route.name,'examine') && mainData.status === '提交'"   type="primary" size="mini" slot="reference">审 核</el-button>
           </el-popover>
           <el-button v-if="tool.checkAuth($route.name,'examine') && mainData.status === '审核'"  type="primary" size="mini" @click="onReturnCheck">反审核</el-button>
           <el-button v-if="tool.checkAuth($route.name,'reback') && mainData.status === '提交' && mainData.status === '交期待确认'"  type="primary" size="mini" @click="dialogVisible = true">退 回</el-button>

src/HDrpManagement/serveBill/modules/workBill/index.vue

@@ -36,9 +36,7 @@
           <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'&& scope.column.columnname != 'reason'">--</p>
         </template>
         <template v-slot:opreation="scope">
-          <el-button class="inline-16" type="text" size="mini" @click="save(scope.data)" v-if="currentProduct.sa_aftersalesmag_itemsid == scope.data.sa_aftersalesmag_itemsid">保 存</el-button>
-          <slot v-else name="editProduct" :data="scope.data"></slot>
-          <slot name="delProduct" :data="scope.data"></slot>
+          <el-button @click="goDetail(scope)" size="mini" type="text">详 情</el-button>
         </template>
       </tableLayout>
     </div>
@@ -85,6 +83,14 @@ export default {
     }
   },
   methods:{
+    goDetail (scope) {
+      let route = this.$route
+      if (route.path !== '/taskDetails') {
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$router.replace({path:'/workorderDetail',query:{id:scope.data.sa_workorderid,rowindex:scope.data.rowindex}})
+    },
     async save (data) {
       let res = await this.$api.requested({
         "id": "20230105111003",
@@ -111,7 +117,7 @@ export default {
       })
     },
     async listData(){
-      this.params.content.sa_aftersalesmagid = this.$route.query.id
+      this.params.content.sa_serviceorderid = this.$route.query.id
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -84,7 +84,7 @@
       <div slot="slot0" >
         <taskDetail :data="nodes">
           <template v-slot:detail="scope">
-              <taskListDetail v-if="tool.checkAuth($route.name,'workDetail')" class="inline-16" :data="scope.data"></taskListDetail>
+              <taskListDetail class="inline-16" :data="scope.data"></taskListDetail>
           </template>
           <!-- <template v-slot:edit="scope">
             <taskListEdit class="inline-16" :data="scope.data"/>

src/HDrpManagement/toolBorrowingMag/modules/edit.vue

@@ -338,12 +338,12 @@ export default {
         "content": {
           "sa_orderid": this.$route.query.id,
           "sys_enterpriseid": this.data.sys_enterpriseid, //订货企业id
-          "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
+          // "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
           "sa_brandid": this.data.sa_brandid, //品牌ID
           "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
           "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
           "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
-          "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+          // "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
           "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
           "type": this.data.type, //订单类型
           "typemx":this.data.typemx, //明细分类，可选

src/SDrpManagement/ProductGroup/index.vue

@@ -27,10 +27,32 @@
             <p class="price descript">价格：<span style="color:red;font-size:16px"><small>¥</small>{{item.minprice}}</span>&nbsp;~&nbsp;<span style="color:red;font-size:16px"><small>¥</small>{{item.maxprice}}</span></p>
           </div>
         </div>
+        <div class="group-item" v-for="item in productGroup" :key="item.sa_itemgroupid" @click="itemClick(item)">
+          <div class="top">
+            <el-image style="width:100%" :src="Object.keys(item.attinfos).length > 0 ? item.attinfos[0].url : ''" fit="cover" />
+          </div>
+          <div class="bottom">
+            <p class="title">{{item.groupname}}</p>
+            <p class="descript">{{item.groupnum}}</p>
+            <p class="descript"><span v-for="(cls,index) in item.itemclass" :key="cls.index">{{index === item.itemclass.length -1 ?cls.itemclassfullname:cls.itemclassfullname + ','}}</span></p>
+            <p class="price descript">价格：<span style="color:red;font-size:16px"><small>¥</small>{{item.minprice}}</span>&nbsp;~&nbsp;<span style="color:red;font-size:16px"><small>¥</small>{{item.maxprice}}</span></p>
+          </div>
+        </div>
+        <div class="group-item" v-for="item in productGroup" :key="item.sa_itemgroupid" @click="itemClick(item)">
+          <div class="top">
+            <el-image style="width:100%" :src="Object.keys(item.attinfos).length > 0 ? item.attinfos[0].url : ''" fit="cover" />
+          </div>
+          <div class="bottom">
+            <p class="title">{{item.groupname}}</p>
+            <p class="descript">{{item.groupnum}}</p>
+            <p class="descript"><span v-for="(cls,index) in item.itemclass" :key="cls.index">{{index === item.itemclass.length -1 ?cls.itemclassfullname:cls.itemclassfullname + ','}}</span></p>
+            <p class="price descript">价格：<span style="color:red;font-size:16px"><small>¥</small>{{item.minprice}}</span>&nbsp;~&nbsp;<span style="color:red;font-size:16px"><small>¥</small>{{item.maxprice}}</span></p>
+          </div>
+        </div>
       </div>
     </div>
     <el-empty description="暂无数据" v-else></el-empty>
-     <div style="margin-top:16px;text-align:center">
+     <div style="text-align:center;padding-top:36px">
       <el-pagination
         background
         small
@@ -164,21 +186,24 @@ export default {
 </script>
 
 <style scoped>
-@media only screen and (max-width: 1200px) {
+/* @media only screen and (max-width: 1200px) {
   .gtc {
     grid-template-columns: repeat(8, 1fr);
   }
-}
+} */
 .content{
-  height:calc(100vh - 370px)
+  height:calc(100vh - 400px);
+  overflow-y: scroll;
 }
 .group .group-list {
-  display: grid;
-  column-gap: 24px;
+  /* display: grid; */
+  /* column-gap: 24px; */
   box-sizing: border-box;
   background-color: transparent;
-  grid-template-columns: repeat(8, 1fr);
-  padding:36px 0;
+  /* grid-template-columns: repeat(8, 1fr); */
+  padding-top:36px;
+  display: flex;
+  flex-wrap: wrap;
 }
 .group .group-list .group-item {
   min-width: 261px;
@@ -188,6 +213,7 @@ export default {
   cursor: pointer;
   overflow: hidden;
   margin-bottom: 36px;
+  margin-right: 16px;
 }
 .group .group-list .group-item .el-image {
   transition: transform 0.3s;

src/SDrpManagement/Products/index.vue

@@ -1,5 +1,18 @@
 <template>
   <div class="container">
+    <div style="display:flex;align-items:center;margin-bottom:16px">
+      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="search"
+          style="width:200px"
+          size="mini"
+          class="input-with-select inline-16"
+          @keyup.native.enter="$refs.list.listData($refs.list.params.content.where.condition=search,$refs.list.params.content.pageNumber=1)"
+          @clear="$refs.list.listData($refs.list.params.content.where.condition='',$refs.list.params.content.pageNumber = 1)"
+          clearable>
+      </el-input>
+    </div>
     <select-class ref="class" @onClassChange="onClassChange" @clickField="clickField" :default="true" ></select-class>
     <list ref="list" ></list>
   </div>
@@ -10,6 +23,11 @@ import list from './modules/list'
 import selectClass from './modules/Select'
 
 export default {
+  data () {
+    return {
+      search:''
+    }
+  },
   components:{
     list,
     selectClass

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:0}}
+        "id":"20220922110403","content":{"sa_brandid":this.brand_act,where:{istool:1}}
       })
       console.log(res.data,'pop')
       this.itemclass = res.data[0].ttemclass

src/SDrpManagement/Products/modules/list.vue

@@ -42,10 +42,11 @@
               </div>
             </div>
           </div>
+            
         </div>
       </div>
       <el-empty description="暂无数据" v-else></el-empty>
-      <div style="margin-top:16px;text-align:center">
+      <div style="text-align:center;padding-top:30px">
         <el-pagination
           background
           small
@@ -133,21 +134,23 @@ export default {
 <style>
 </style>
 <style scoped>
-@media only screen and (max-width: 1200px) {
+/* @media only screen and (max-width: 1200px) {
   .gtc {
     grid-template-columns: repeat(8, 1fr);
   }
-}
+} */
 .content{
-  height:calc(100vh - 370px)
+  height:calc(100vh - 400px);
+  overflow-y: scroll;
 }
 .group .group-list {
-  display: grid;
-  column-gap: 24px;
+  /* display: grid; */
+  /* column-gap: 24px; */
   box-sizing: border-box;
   background-color: transparent;
-  grid-template-columns: repeat(8, 1fr);
-  padding:10px 0;
+  /* grid-template-columns: repeat(8, 1fr); */
+  display: flex;
+  flex-wrap: wrap;
 }
 .group .group-list .group-item {
   min-width: 261px;
@@ -157,6 +160,7 @@ export default {
   cursor: pointer;
   overflow: hidden;
   margin-bottom: 36px;
+  margin-right: 16px;
 }
 .group .group-list .group-item .el-image {
   transition: transform 0.3s;

src/SDrpManagement/agentOrder/index.vue

@@ -14,7 +14,7 @@
       <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-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>
@@ -25,7 +25,7 @@
         </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-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>

src/SDrpManagement/agentOrder/modules/add.vue

@@ -152,7 +152,7 @@ export default {
         })
         this.tool.showMessage(res,()=>{
           this.$store.dispatch('changeDetailDrawer',true)
-          this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
+          this.$router.push({path:'/agent_orderDetails',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
         })
       } else {
         this.drawer = true
@@ -171,7 +171,7 @@ export default {
         this.tool.showMessage(res,()=>{
           this.drawer = false
           this.$store.dispatch('changeDetailDrawer',true)
-          this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
+          this.$router.push({path:'/agent_orderDetails',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
         })
       })
     },

src/SDrpManagement/myaccountclass/index.vue

@@ -79,7 +79,8 @@ export default {
       const res = await this.$api.requested({
         id:"20221008145903",
         content:{
-          "sys_enterpriseid":JSON.parse(window.sessionStorage.getItem('accountinfo')).enterprise.sys_enterpriseid
+          type:1
+          // "sys_enterpriseid":JSON.parse(window.sessionStorage.getItem('accountinfo')).enterprise.sys_enterpriseid
         }
       })
       this.acountlist = res.data

src/SDrpManagement/salerToolBorrowing/modules/add.vue

@@ -212,7 +212,7 @@ export default {
         "billdate":"",//单据日期，默认创建日期
         "signbacknum":""
       }
-      // this.$refs['enterprise'].form.enterprisename = ''
+      this.$refs['enterprise'].form.enterprisename = ''
       this.drawer = false
     }
   }

src/SDrpManagement/salerToolBorrowing/modules/edit.vue

@@ -338,12 +338,12 @@ export default {
         "content": {
           "sa_orderid": this.$route.query.id,
           "sys_enterpriseid": this.data.sys_enterpriseid, //订货企业id
-          "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
+          // "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
           "sa_brandid": this.data.sa_brandid, //品牌ID
           "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
           "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
           "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
-          "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+          // "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
           "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
           "type": this.data.type, //订单类型
           "typemx":this.data.typemx, //明细分类，可选

src/SDrpManagement/sinvoiceapp/modules/add.vue

@@ -151,6 +151,8 @@ export default {
           this.tool.showMessage(res,()=>{
             this.$emit('onSuccess')
             this.drawer = false
+            this.$store.dispatch('changeDetailDrawer',true)
+            this.$router.push({path:'/sinvoiceDetail',query:{id:res.data.sa_invoiceapplyid,rowindex:res.data.rowindex}})
             this.form = {
               enterprisename:'',
               taxno:'',

src/SDrpManagement/toolBorrowing/modules/add.vue

@@ -135,7 +135,7 @@ export default {
           this.drawer = false
          
           this.$store.dispatch('changeDetailDrawer',true)
-          this.$router.push({path:'/toolBorrowingMagDetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
+          this.$router.push({path:'/toolBorrowingDetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
         })
       })
     },
@@ -187,7 +187,6 @@ export default {
       this.childField = item.subvalues
     },
     refresh () {
-      this.drawer = false
       this.form = {
         "sa_orderid": 0,
         "sys_enterpriseid": 0, //订货企业id，可不传，默认取当前账号的
@@ -208,8 +207,7 @@ export default {
         "billdate":"",//单据日期，默认创建日期
         "signbacknum":""
       }
-      this.$refs['enterprise'].form.enterprisename = ''
-
+      this.drawer = false
     }
   }
 }

src/SDrpManagement/toolBorrowing/modules/edit.vue

@@ -342,12 +342,12 @@ export default {
         "content": {
           "sa_orderid": this.$route.query.id,
           "sys_enterpriseid": this.data.sys_enterpriseid, //订货企业id
-          "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
+          // "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
           "sa_brandid": this.data.sa_brandid, //品牌ID
           "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
           "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
           "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
-          "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
+          // "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
           "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
           "type": this.data.type, //订单类型
           "typemx":this.data.typemx, //明细分类，可选