代码上传

src/Form/cashcoupon/add.vue

@@ -202,7 +202,13 @@ export default {
     subClassList(){
       this.$store.dispatch('optiontypeselect','rebatebillpaytype').then(res=>{
         console.log(res,'分类明细')
-        this.subClassData = res.data[0].subvalues
+        let index = ''
+        for (var i = 0 ;i<res.data.length; i++){
+          if (res.data[i].value === '返利金'){
+            index = i
+          }
+        }
+        this.subClassData = res.data[index].subvalues
       })
     },
     /*获取企业*/

src/Form/productMoneyOdd/add.vue

@@ -49,13 +49,15 @@ export default {
         if (!valid) return false
         const res = await this.$api.requested({
           "id": "20221024163804",
-          "version":1,
           "content": this.form
         })
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
+          console.log(res.data,'商品调价单')
+          /*this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/productMoneyOddDetail',query:{id:res.data.sa_itempriceadjustid,rowindex:res.data.rowindex}})*/
         })
       })
     },

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 :data="mainData" v-if="tool.checkAuth($route.name,'boxInfo') && mainData" ref="boxlist"></boxlist>
           <el-empty description="暂无查询权限" v-else></el-empty>
         </div>
         <div  slot="slot3">
@@ -51,7 +51,7 @@
     name: "detail",
     data() {
       return {
-        mainData:{},
+        mainData:'',
         mainAreaData:{}
       }
     },

src/HDrpManagement/logistics/details/tabs/logisticsBox/logisticsBox.vue

@@ -21,12 +21,12 @@
           width="120">
           <template slot-scope="scope">
             <!-- <el-button class="inline-16" type="text" size="small" slot="reference">编 辑</el-button> -->
-            <editTemp class="inline-16" :data="scope.row" @onSuccess="listData"></editTemp>
+            <editTemp v-if="data.status == '新建' && tool.checkAuth($route.name,'boxInfo')" class="inline-16" :data="scope.row" @onSuccess="listData"></editTemp>
             <el-popconfirm
               title="确定删除吗？"
               @confirm="deleteRow(scope.row)"
             >
-              <el-button v-if="tool.checkAuth($route.name,'boxInfo')"  type="text" size="small" slot="reference">删 除</el-button>
+              <el-button v-if="tool.checkAuth($route.name,'boxInfo') && data.status == '新建'"  type="text" size="small" slot="reference">删 除</el-button>
             </el-popconfirm>
           </template>
         </el-table-column>
@@ -56,6 +56,7 @@ export default {
     boxlistmx,
     editTemp
   },
+  props:['data'],
   data () {
     return {
       params:{

src/HDrpManagement/logistics/index.vue

@@ -12,7 +12,13 @@
         :detailPath="{
           path:'/logisticsdetail'
         }">
-        <div slot="custom"></div>
+        <template #custom>
+          <div class="mt-10">
+            <label  class="search__label" >订单号:</label>
+            <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="$refs.basicLayout.param.content.where.sonum?$refs.basicLayout.param.content.where.sonum.length > 0?'':'':'el-icon-search'" v-model="$refs.basicLayout.param.content.where.sonum" @keyup.native.enter="$refs.basicLayout.listData($refs.basicLayout.param.content.pageNumber = 1)" @clear="$refs.basicLayout.listData($refs.basicLayout.param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+            </el-input>
+          </div>
+        </template>
         <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>

src/HDrpManagement/logistics/modules/defaultInfo.vue

@@ -12,7 +12,7 @@
       <el-descriptions-item label="快递公司">{{ mainData.logiscomp_enterprisename?mainData.logiscomp_enterprisename:"--" }}</el-descriptions-item>
       <el-descriptions-item label="快递单号">{{ mainData.logisticno?mainData.logisticno:"--" }}</el-descriptions-item>
       <el-descriptions-item :style="style(mainData.status)" label="运费状态">
-        <span :style="colorStyle">{{ mainData.status?mainData.status:"--" }}</span>
+        {{ mainData.paytype }}
       </el-descriptions-item>
       <el-descriptions-item label="运费">{{ mainData.freightamount?mainData.freightamount:"--" }}</el-descriptions-item>
       <el-descriptions-item label="备注">{{ mainData.remarks?mainData.kd100remarksid:"--" }}</el-descriptions-item>

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,10 +38,10 @@
               <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>
+          <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') && mainData.status === '新建'" type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
           <el-button v-if="tool.checkAuth($route.name,'close') && 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>
@@ -360,7 +361,21 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        this.tool.showMessage(res)
+        /*this.tool.showMessage(res)*/
+       /* this.$store.dispatch('changeDetailDrawer',false)
+        this.$store.dispatch('changeDetailDrawer',true)
+        this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})*/
+
+        this.$store.dispatch('changeDetailDrawer',false)
+        setTimeout(()=>{
+          this.$router.replace({
+            path:'/orderdetail',
+            query:{
+              id:res.data.sa_orderid
+            }
+          })
+          this.$store.dispatch('changeDetailDrawer',true)
+        },500)
       })
     },
     select (data) {

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

@@ -19,6 +19,11 @@
           width="55"
           align="center">
         </el-table-column>
+        <el-table-column
+            prop="rowno"
+            label="行号"
+            width="50">
+        </el-table-column>
         <el-table-column
           prop="itemname"
           label="产品名称"

src/HDrpManagement/serveBill/components/add.vue

@@ -24,7 +24,7 @@
             </el-col>
             <el-col :span="12" v-if="form.servicetype == '售中' || form.servicetype == '售后'">
               <el-form-item label="订单号:" prop="sonum">
-                <selectOrder ref="order" @selectRow="orderChange">
+                <selectOrder :id="form.sys_enterpriseid" ref="order" @selectRow="orderChange">
                     <el-input readonly :disabled="!form.sys_enterpriseid" type="text" slot="input" size="mini" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum"></el-input>
                 </selectOrder>
               </el-form-item>

src/HDrpManagement/serveBill/components/selectOrder.vue

@@ -68,6 +68,7 @@
 
 <script>
 export default {
+  props:['id'],
   data () {
     return {
       visible:false,
@@ -88,6 +89,7 @@ export default {
   },
   methods:{
     async listData () {
+      this.param.content.sys_enterpriseid = this.id
       const res = await this.$api.requested(this.param)
       this.tableData = res.data
       this.total = res.total

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/SDrpManagement/ProductGroup/index.vue

@@ -30,7 +30,7 @@
       </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
@@ -62,9 +62,10 @@ export default {
           "pageNumber":1,
           "nocache":true,
           "brandids":[],
-          "tradefield":'',
+
           "where":{
-              "condition":""
+              "condition":"",
+            "tradefield":'',
           }
         }
       },
@@ -106,6 +107,8 @@ export default {
       this.params.content.brandids = this.brandId
       let res = await this.$api.requested(this.params)
       this.productGroup = res.data
+      console.log(this.productGroup);
+      
       this.total = res.total
       this.currentPage = res.pageNumber
     },
@@ -141,7 +144,7 @@ export default {
       this.getProductGroup()
     },
     clickField (item) {
-      this.params.content.tradefield = item.tradefield
+      this.params.content.where.tradefield = item.tradefield
       this.getProductGroup()
     },
     handleSizeChange(val) {
@@ -163,21 +166,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;
@@ -187,6 +193,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/ProductGroup/modules/Select.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="border-bottom">
     <div>
-      <ul class="flex-align-center normal-margin" >
+      <ul class="flex-align-center normal-margin-new" >
         <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField('')" >全部领域</li>
         <li  :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
-      <ul class="flex-align-center normal-margin">
+      <ul class="flex-align-center normal-margin-new">
         <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">全部品牌</li>
-        <li  :class="brand_act === item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
+        <li  :class="brand_act == item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
-      <ul class="flex-align-center normal-margin">
+      <ul class="flex-align-center normal-margin-new">
         <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
         <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
       </ul>
@@ -23,6 +23,7 @@
 
 <script>
 import classTree from './classTree.vue'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   data () {
     return {
@@ -98,6 +99,8 @@ export default {
         this.class_act = ''
         this.$emit('onClassChange',item)
       }
+      console.log(this.class_act);
+      
       
     },
     change(n) {
@@ -130,6 +133,9 @@ export default {
   color:#3874f6;
   font-weight: bold;
 }
+.normal-margin-new{
+  margin-bottom: 2px !important;
+}
 .border-bottom{
   padding-bottom:16px;
   border-bottom: 1px solid #e3e5ea;

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

@@ -1,15 +1,15 @@
 <template>
   <div class="border-bottom">
     <div>
-      <ul class="flex-align-center normal-margin">
+      <ul class="flex-align-center normal-margin-new">
         <li :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField('')">全部领域</li>
         <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
-      <ul class="flex-align-center normal-margin">
+      <ul class="flex-align-center normal-margin-new">
         <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">全部品牌</li>
         <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
-      <ul class="flex-align-center normal-margin">
+      <ul class="flex-align-center normal-margin-new">
         <li :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
         <li :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
       </ul>
@@ -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
@@ -130,6 +130,9 @@ export default {
   color:#3874f6;
   font-weight: bold;
 }
+.normal-margin-new{
+  margin-bottom: 2px !important;
+}
 .border-bottom{
   padding-bottom:16px;
   border-bottom: 1px solid #e3e5ea;

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/details/tabs/dispatch.vue

@@ -56,9 +56,9 @@ export default {
       param:{
         "id": 20221205111302,
         "content": {
-          "sa_orderid": 12,
+          "sa_orderid": this.$route.query.id,
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }

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

@@ -49,9 +49,9 @@ export default {
       param:{
         "id": 20221205111402,
         "content": {
-          "sa_orderid": 12,
+          "sa_orderid": this.$route.query.id,
           "pageNumber": 1,
-          "pageSize": 17,
+          "pageSize": 20,
           "where": {
             "condition": ""
           }

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/agentOrder/modules/edit.vue

@@ -39,7 +39,7 @@
             <div v-if="checked" class="flex-align-center">
               <p class="inline-16"><b>返利金余额:{{tool.formatAmount(defaultData.rebatebalance,2)}}</b></p>
               <el-input class="inline-16" size="mini" style="width:150px" v-model="rebateamount" @blur="useRebate" placeholder="输入使用金额"></el-input>
-              <small>(返利金最高使用比例{{data.order_rebate_userate}}%,本单上限:{{tool.formatAmount(data.amount * data.order_rebate_userate / 100,2)}})</small>
+              <small>(返利金最高使用比例{{data.order_rebate_userate}},本单上限:{{tool.formatAmount(data.amount * data.order_rebate_userate / 100,2)}})</small>
             </div>
           </div>
         </div>

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -1,7 +1,7 @@
 <template>
 <el-row :gutter="10">
   <el-col :span="setcol">
-    <el-button style="margin:0 0 10px 0px" size="small" type="primary" @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
+    <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -15,6 +15,11 @@
         width="55"
         align="center">
       </el-table-column> -->
+      <el-table-column
+          prop="rowno"
+          label="行号"
+          width="50">
+      </el-table-column>
       <el-table-column
         prop="itemname"
         label="产品名称"

src/SDrpManagement/myaccountclass/index.vue

@@ -15,6 +15,7 @@
               </div>
             </el-col>
           </el-row>
+
           <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="calc(100vh - 390px)">
             <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname == 'type'">
@@ -79,7 +80,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/salerOrder/details/index.vue

@@ -24,7 +24,7 @@
         <default-info :mainData="mainData"></default-info>
       </div>
       <div slot="slot1">
-        <product-list ref="prod"></product-list>
+        <product-list :data="mainData" ref="prod"></product-list>
       </div>
       <div slot="slot2">
         <orderprogress ref="prod"></orderprogress>

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -15,6 +15,11 @@
         width="55"
         align="center">
       </el-table-column> -->
+      <el-table-column
+          prop="rowno"
+          label="行号"
+          width="50">
+      </el-table-column>
       <el-table-column
         prop="itemname"
         label="产品名称"

src/SDrpManagement/sinvoiceapp/modules/add.vue

@@ -32,7 +32,7 @@
                 </el-popover>
               </el-form-item>
               <el-form-item label="开票单位">
-                <el-input readonly v-model="form.invo_enterprisename" placeholder="开票单位"></el-input>
+                <el-input readonly v-model="form.enterprisename" placeholder="开票单位"></el-input>
               </el-form-item>
               <el-form-item label="开票地址">
                 <el-input readonly v-model="form.address" placeholder="开票地址"></el-input>
@@ -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:'',
@@ -169,7 +171,7 @@ export default {
     // 选择开票信息
     selectTaxRow (row) {
       this.visible1 = false
-      this.form.invo_enterprisename = row.enterprisename
+      this.form.enterprisename = row.enterprisename
       this.form.taxno = row.taxno
       this.form.address = row.address
       this.form.phonenumber = row.phonenumber

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}})
         })
       })
     },

src/SManagement/setenterpriseInfo/index.vue

@@ -2,7 +2,7 @@
     <normalLayout>
       <div class="container" slot="content">
         <!-- <el-button class="normal-margin" type="primary" size="small">编 辑</el-button> -->
-        <editInfo class="normal-margin" :data="enterpriseInfo" :btnType="'primary'" btnSize="small" :hideGrade="true" @onSuccess="enterpriseData"></editInfo>
+<!--        <editInfo class="normal-margin" :data="enterpriseInfo" :btnType="'primary'" btnSize="small" :hideGrade="true" @onSuccess="enterpriseData"></editInfo>-->
         <el-descriptions class="normal-margin" :labelStyle="{width:'120px'}" title="" :column="2" size="medium" border>
           <el-descriptions-item>
             <template slot="label">

src/template/toolBorrowingCanUseContract/index.vue

@@ -16,7 +16,7 @@
         label="合同标题"
         width="180">
       </el-table-column>
-      <el-table-column
+<!--      <el-table-column
         prop="enterprisename"
         label="企业信息"
         width="180">
@@ -25,7 +25,7 @@
         prop="projectname"
         label="项目名称"
         width="180">
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column
         prop="type"
         label="项目类型"

vue.config.js

@@ -14,7 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host
+          /*target: 'http://61.164.207.46:8000',  // target host*/
+            target: 'http://122.226.136.204:8082/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites