代码更新

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

@@ -62,9 +62,10 @@ export default {
           "pageNumber":1,
           "nocache":true,
           "brandids":[],
-          "tradefield":'',
+
           "where":{
-              "condition":""
+              "condition":"",
+            "tradefield":'',
           }
         }
       },
@@ -141,7 +142,7 @@ export default {
       this.getProductGroup()
     },
     clickField (item) {
-      this.params.content.tradefield = item.tradefield
+      this.params.content.where.tradefield = item.tradefield
       this.getProductGroup()
     },
     handleSizeChange(val) {

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>
       </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>
@@ -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/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>
@@ -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/agentOrder/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/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/toolBorrowing/modules/add.vue

@@ -187,6 +187,7 @@ export default {
       this.childField = item.subvalues
     },
     refresh () {
+      this.drawer = false
       this.form = {
         "sa_orderid": 0,
         "sys_enterpriseid": 0, //订货企业id，可不传，默认取当前账号的
@@ -208,7 +209,7 @@ export default {
         "signbacknum":""
       }
       this.$refs['enterprise'].form.enterprisename = ''
-      this.drawer = false
+
     }
   }
 }

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

@@ -15,6 +15,7 @@ module.exports = {
       proxy: {
         '/apis': {
           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