2023-3-23

src/HDrpManagement/ProductMag/index.vue

@@ -56,6 +56,22 @@
             </el-option>
           </el-select>
         </div>
+        <div class="mt-10">
+          <el-input 
+            style="width:200px;" 
+            placeholder="型号" 
+            suffix-icon="el-icon-search" 
+            v-model="selectParam.model" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
+        <div class="mt-10">
+          <el-input 
+            style="width:200px;" 
+            placeholder="规格" 
+            suffix-icon="el-icon-search" 
+            v-model="selectParam.spec" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div>
@@ -155,7 +171,9 @@ export default {
       ],
       selectParam:{
         isonsale:'',
-        status:''
+        status:'',
+        model:'',
+        spec:''
       },
       rowData:[],
       errorUrl:null
@@ -217,6 +235,7 @@ export default {
       })
     },
     selectChange(){
+      this.$refs.basicLayout.param.content.pageNumber = 1
       this.$refs.basicLayout.param.content.where = this.selectParam
       this.$refs.basicLayout.listData()
     },

src/HDrpManagement/contractManage/components/addContract.vue

@@ -1037,7 +1037,7 @@ export default {
           }
         }*/
         return {
-          label:item.ruleno + '-' + item.remarks ,
+          label:item.ruleno + '-' + item.remarks,
           value:item.ruleno + '-' + item.remarks
         }
 

src/HDrpManagement/contractManage/modules/detail.vue

@@ -17,6 +17,16 @@
       </div>
       <div slot="customOperation">
         <editBtn class="inline-16" :modelList="modelList" v-if="tool.checkAuth($route.name,'update')" :disabled="mainData.status != '新建' || !isLeader" @onSuccess="queryMainData();$refs.billno && $refs.billno.listData()" :data="mainData" />
+        <customBtn 
+          btnName="一键转单"
+          message="确认将当前合同转为订单吗?"
+          idName="20230322153702"
+          keyName="sa_contractid"
+          :id="$route.query.id"
+          @onSuccess="changeBill"
+          class="inline-16"
+          v-if="mainData.status == '审核' && ($route.query.type == '经销项目' || $route.query.type == '直销项目') && (tool.checkAuth($route.name,'changeBillMag') || tool.checkAuth($route.name,'changeBillSaler') || tool.checkAuth($route.name,'changeBillOrder'))"
+        />
         <revoke class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'revoke') && mainData.status === '已提交' && isLeader" ></revoke>
         <submit-check class="inline-16"  :disabled="!isLeader" ref="submit" :data="mainData" @onSuccess="queryMainData" />
         <reverseCheck class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status === '审核'"  />
@@ -1202,6 +1212,36 @@ export default {
                   }
 
 
+    },
+    changeBill (data) {
+      this.oldRoute = {path:this.$route.path,query:this.$route.query}
+      this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      if (this.tool.checkAuth(this.$route.name,'changeBillMag')) {
+        console.log('管理',this.tool.checkAuth(this.$route.name,'changeBillMag'));
+        this.$router.push({
+          path:'/orderdetail',
+          query:{
+            id:data.sa_orderid,
+          }
+        })
+      } else if (this.tool.checkAuth(this.$route.name,'changeBillSaler')) {
+        console.log('业务');
+        this.$router.push({
+          path:'/saler_orderDetails',
+          query:{
+            id:data.sa_orderid,
+          }
+        })
+      } else if (this.tool.checkAuth(this.$route.name,'changeBillOrder')) {
+        console.log('订单');
+        this.$router.push({
+          path:'/agent_orderDetails',
+          query:{
+            id:data.sa_orderid,
+          }
+        })
+      }
+      console.log(data);
     },
     async bindImportOrder (id) {
       const res = await this.$api.requested({

src/HDrpManagement/dispatch/modules/add.vue

@@ -24,7 +24,7 @@
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号"></el-table-column>
         <el-table-column prop="projectname" label="项目名称"></el-table-column>
-        <el-table-column prop="projectnodes" label="项目备注"></el-table-column>
+        <el-table-column prop="projectnote" label="项目备注"></el-table-column>
         <el-table-column prop="enterprisename" label="企业名称"></el-table-column>
         <el-table-column prop="checkdate" label="审核时间"></el-table-column>
         <el-table-column prop="remarks" label="备注"></el-table-column>

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

@@ -21,6 +21,21 @@
         ></uploadAllData>
       </div>
       <p class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal" v-if="data.status === '新建'">{{checkFreefreightamount}}</p>
+      <!-- <tableLayout :layout="tablecols" :data="tableData" :custom="true" :checkbox="true" fixedName="rowno itemname itemno erpitemno model" redirect="left">
+        <template v-slot:customcol="scope">
+        
+          <p v-if="scope.column.columnname === 'status'">
+            <span :style="scope.column.data.status === '启用'?'color:#52C41A':'color:#FF3B30'">{{scope.column.data.status}}</span>
+          </p>
+          <p v-else-if="scope.column.columnname === 'province'">
+            <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
+          </p>
+          <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+        </template>
+        <template v-slot:opreation="scope">
+          <slot name="detail" :data="scope.data"></slot>
+        </template>
+      </tableLayout> -->
       <el-table
         ref="multipleTable"
         :data="tableData"
@@ -358,7 +373,8 @@ export default {
   components:{
     excel,
     addProduct,
-    uploadAllData
+    uploadAllData,
+    tablecols:[]
   },
   computed: {
     checkNB () {
@@ -729,6 +745,7 @@ export default {
   },
   created() {
     this.tablecolsAdd = this.tool.tabelCol(this.$route.name).addProductTable.tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols
   }
 }
 

src/HDrpManagement/projectChange/modules/detail.vue

@@ -20,7 +20,6 @@
       <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery')  && mainData.status === '已失败'" :rowData="mainData" :disabled="mainData.disabled" @onRecovery="onSuccess"></recovery>
       <finish class="inline-16" v-if="tool.checkAuth($route.name,'finish')  && mainData.status === '跟进中'" :disabled="mainData.disabled" @onFinish="onSuccess"></finish>
       <Del class="inline-16" :id="mainData.sa_projectid" :nameId="20221020144302" :rowData="mainData" nameKey="sa_projectids" v-if="tool.checkAuth($route.name,'toVoid') " :disabled="mainData.disabled" @deleteSuccess="deleteSuccess"/>
-
     </div>
     <template #customBefore>
       <div class="flex-align-start normal-panel mt-10 flex-between"  style="flex-wrap:nowrap;border-radius: 5px;padding:10px 10px 0 10px">

src/HDrpManagement/recvoucher/details/index.vue

@@ -37,6 +37,9 @@
           message="确认对冲当前收入凭证吗?"
           idName="20230306102904"
           keyName="sa_cashbillid"
+          :dialog="true"
+          dialogTitle="请输入对冲金额"
+          dialogKey="amount"
           :id="$route.query.id"
           @onSuccess="duichong"
           class="inline-16"

src/HManagement/archives_sc/list/modules/details.vue

@@ -258,7 +258,9 @@ export default {
     this.coursewareclass()
     this.tool.checkAuth(this.$route.name,'data_analysis')?'':this.$router.go(-1)
     //详情页禁用操作
-    store.state.pageOnlyRead = true
+    setTimeout(() => {
+      this.$store.dispatch('pageOnlyRead',true)
+    },500)
   },
   mounted () {
     setTimeout(() => {

src/HManagement/archvies_mag/modules/list.vue

@@ -67,7 +67,7 @@ export default {
         "classname": "webmanage.saletool.salematerial.salematerial",
         "method": "selectList",
         "content": {
-          "parentid": 0,
+          "parentid": JSON.parse(sessionStorage.getItem('folderid')).salematerialfolderid,
           "pageNumber": 1,
           "pageSize": 20,
           "where": {
@@ -99,7 +99,6 @@ export default {
       this.queryAttachment(this.params.content.parentid)
     },
     async queryAttachment() {
-      this.params.content.parentid = JSON.parse(sessionStorage.getItem('folderid')).salematerialfolderid
       const res = await this.$api.requested(this.params)
       res.data.map(e => {
         e.postfix = e.postfix.toUpperCase()

src/SDrpManagement/invoiceapp_saler/index.vue

@@ -11,7 +11,7 @@
       :apiId="{query:20221216143103,del:20221216143203}"
       :options="options"
       :detailPath="{
-        path:'/invoiceDetail'
+        path:'/sinvoiceDetail_saler'
       }"
       @listData="list">
       <template #custom>

src/SManagement/archives/index.vue

@@ -51,7 +51,7 @@ export default {
           "nocache": true,
           "pageNumber": 1,
           "pageSize": 25,
-          "parentid": 0,
+          "parentid": JSON.parse(sessionStorage.getItem("folderid")).salematerialfolderid,
           "where": {
             "condition": "",
           }
@@ -100,7 +100,6 @@ export default {
     //获取文件数据 //salematerialfolderid
     async getFileList() {
       console.log(this.params)
-      this.params.content.parentid = JSON.parse(sessionStorage.getItem("folderid")).salematerialfolderid
       let res = await this.$api.requested(this.params)
       this.total = res.total
       this.params.content.sort = res.sort

src/SManagement/archivesmag/index.vue

@@ -41,7 +41,7 @@ export default {
           "nocache":true, 
           "pageNumber": 1,
           "pageSize": 25,
-          "parentid": 1,
+          "parentid": JSON.parse(sessionStorage.getItem("folderid")).salematerialfolderid,
           "where": {
               "condition": "",
           }

src/router/HDrpManagement.js

@@ -1,3 +1,20 @@
+import privateCustomer from '@/HDrpManagement/privateCustomer/index'
+import PrivateCustomerDetail from '@/HDrpManagement/privateCustomer/modules/detail'
+import PublicCustomer from '@/HDrpManagement/publicCustomer/index'
+import PublicCustomerDetail from '@/HDrpManagement/publicCustomer/modules/detail'
+import projectChange from '@/HDrpManagement/projectChange/index'
+import projectChangeDetail from '@/HDrpManagement/projectChange/modules/detail'
+import competitor from '@/HDrpManagement/competitor/index'
+import competitorDetail from '@/HDrpManagement/competitor/detail/index'
+import contract_manage from '@/HDrpManagement/contractManage/index'
+import contractDetail from '@/HDrpManagement/contractManage/modules/detail'
+import addContract from '@/HDrpManagement/contractManage/components/addContract'
+import contract_model from '@/HDrpManagement/contractModel/index'
+import contractModelDetail from '@/HDrpManagement/contractModel/modules/detail'
+import ordermag from '@/HDrpManagement/orderManage/index'
+import orderdetail from '@/HDrpManagement/orderManage/details/index'
+import invoiceapp from '@/HDrpManagement/invoiceapp/index'
+import invoiceDetail from '@/HDrpManagement/invoiceapp/detail/detail'
 const HDrpManagement = [
   {
     path: '/directSelling',
@@ -27,7 +44,7 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/orderManage/index'),
+    component: ordermag,
     children:[
       {
         path: '/orderdetail',
@@ -36,7 +53,7 @@ const HDrpManagement = [
           title: '订单详情',
           ast_nav: true,
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/orderManage/details/index'),
+        component: orderdetail,
       },
     ]
   },
@@ -293,7 +310,7 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/privateCustomer/index')
+    component: privateCustomer
   },{
     path: '/PrivateCustomerDetail',
     name:'PrivateCustomer',
@@ -302,7 +319,7 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/privateCustomer/modules/detail')
+    component: PrivateCustomerDetail
   },{
     path: '/PublicCustomer',
     name:'PublicCustomer',
@@ -311,7 +328,7 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/publicCustomer/index'),
+    component: PublicCustomer,
     children:[
       {
         path: '/PublicCustomerDetail',
@@ -321,7 +338,7 @@ const HDrpManagement = [
           ast_nav: true,
           keeproute: true,
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/publicCustomer/modules/detail')
+        component: PublicCustomerDetail
       },
     ]
   },{
@@ -371,7 +388,7 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/competitor/index'),
+    component: competitor,
     children: [
       {
         path: '/competitorDetail',
@@ -381,7 +398,7 @@ const HDrpManagement = [
           ast_nav: true,
           keeproute: true,
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/competitor/detail/index')
+        component: competitorDetail
       }
     ]
   },{
@@ -392,7 +409,7 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/projectChange/index'),
+    component: projectChange,
     children:[
       {
         path: '/projectChangeDetail',
@@ -402,7 +419,7 @@ const HDrpManagement = [
           ast_nav:true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/projectChange/modules/detail')
+        component: projectChangeDetail
       }
     ]
   },{
@@ -452,7 +469,7 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractManage/index'),
+    component: contract_manage,
     children:[
       {
         path: '/contractDetail',
@@ -462,7 +479,7 @@ const HDrpManagement = [
           ast_nav:true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractManage/modules/detail')
+        component: contractDetail
       },
       {
         path: '/addContract',
@@ -472,7 +489,7 @@ const HDrpManagement = [
           ast_nav:true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractManage/components/addContract')
+        component: addContract
       },
     ]
   },{
@@ -483,7 +500,7 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractModel/index'),
+    component: contract_model,
     children: [
       {
         path: '/contractModelDetail',
@@ -493,7 +510,7 @@ const HDrpManagement = [
           ast_nav: true,
           keeproute: true,
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractModel/modules/detail')
+        component: contractModelDetail
       },
     ]
   },{
@@ -547,7 +564,7 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/invoiceapp/index'),
+    component: invoiceapp,
     children: [
       {
         path: '/invoiceDetail',
@@ -557,7 +574,7 @@ const HDrpManagement = [
           ast_nav: true,
           keeproute: true,
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/invoiceapp/detail/detail')
+        component: invoiceDetail
       },
     ]
   },

src/router/HManagement.js

@@ -1,3 +1,7 @@
+import agentManage from '@/HManagement/marketing2/agent/index.vue'
+import agent_detail from '@/HManagement/marketing2/agent/details/index.vue'
+import EnterpriseArchives from '@/HManagement/EnterpriseArchives/index.vue'
+import EnterpriseArchivesDetail from '@/HManagement/EnterpriseArchives/index.vue'
 const HManagement = [
   {
     path: '/archives_adlist',
@@ -130,7 +134,7 @@ const HManagement = [
       ast_nav: true,
       keeproute:true
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing2/agent/index.vue'),
+    component: agentManage,
     children:[
       {
         path: '/agent_detail',
@@ -140,7 +144,7 @@ const HManagement = [
           ast_nav: true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing2/agent/details/index.vue')
+        component: agent_detail
       }
     ]
   }, {
@@ -194,7 +198,7 @@ const HManagement = [
       ast_nav: true,
       keeproute: true
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/EnterpriseArchives/index.vue'),
+    component: EnterpriseArchives,
     children:[
       {
         path: '/EnterpriseArchivesDetail',
@@ -204,7 +208,7 @@ const HManagement = [
           ast_nav:true,
           keeproute:true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/HManagement/EnterpriseArchives/modules/details.vue')
+        component: EnterpriseArchivesDetail
       }
     ]
   },

src/router/SDrpManagement.js

@@ -1,3 +1,15 @@
+import quotedprice from '@/SDrpManagement/QuotedPrice/index'
+import quotedPriceDetail from '@/SDrpManagement/QuotedPrice/detail/index'
+
+import order from '@/SDrpManagement/agentOrder/index'
+import agent_orderDetails from '@/SDrpManagement/agentOrder/details/index'
+import ordersaler from '@/SDrpManagement/salerOrder/index'
+import saler_orderDetails from '@/SDrpManagement/salerOrder/details/index'
+
+import sinvoiceapp from '@/SDrpManagement/sinvoiceapp/index'
+import sinvoiceDetail from '@/SDrpManagement/sinvoiceapp/detail/detail'
+import sinvoiceapp_saler from '@/SDrpManagement/invoiceapp_saler/index'
+import sinvoiceDetail_saler from '@/SDrpManagement/invoiceapp_saler/detail/detail'
 const SDrpManagement = [
   {
     path: '/products',
@@ -56,7 +68,7 @@ const SDrpManagement = [
       ast_nav:true,
       keeproute: true
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/agentOrder/index'),
+    component: order,
     children:[
       {
         path: '/agent_orderDetails',
@@ -66,7 +78,7 @@ const SDrpManagement = [
           ast_nav:true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/agentOrder/details/index')
+        component: agent_orderDetails
       }
     ]
   },
@@ -78,7 +90,7 @@ const SDrpManagement = [
       ast_nav:true,
       keeproute: true
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/salerOrder/index'),
+    component: ordersaler,
     children:[
       {
         path: '/saler_orderDetails',
@@ -88,7 +100,7 @@ const SDrpManagement = [
           ast_nav:true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/salerOrder/details/index')
+        component: saler_orderDetails
       }
     ]
   },
@@ -122,7 +134,7 @@ const SDrpManagement = [
       ast_nav:true,
       keeproute: true
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/QuotedPrice/index'),
+    component: quotedprice,
     children:[
       {
         path: '/quotedPriceDetail',
@@ -132,7 +144,7 @@ const SDrpManagement = [
           ast_nav:true,
           keeproute: true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/QuotedPrice/detail/index')
+        component: quotedPriceDetail
       },
       {
         path: '/quotedPriceCopy',
@@ -154,7 +166,8 @@ const SDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/sinvoiceapp/index'),
+    
+    component: sinvoiceapp,
     children: [
       {
         path: '/sinvoiceDetail',
@@ -164,7 +177,7 @@ const SDrpManagement = [
           ast_nav: true,
           keeproute: true,
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/sinvoiceapp/detail/detail')
+        component: sinvoiceDetail
       },
     ]
   },
@@ -176,7 +189,7 @@ const SDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/invoiceapp_saler/index'),
+    component: sinvoiceapp_saler,
     children: [
       {
         path: '/sinvoiceDetail_saler',
@@ -186,7 +199,7 @@ const SDrpManagement = [
           ast_nav: true,
           keeproute: true,
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/SDrpManagement/invoiceapp_saler/detail/detail')
+        component: sinvoiceDetail_saler
       },
     ]
   },