2022-10-10 10:00

src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button type="text" size="small" @click="detailBtn">明细</el-button>
     <el-dialog title="产品组商品明细" append-to-body :visible.sync="dialogTableVisible" width="70%">
-      <add-btn v-if="tool.checkAuth($route.name,'insert')" @onSuccess="getDetail" style="margin-bottom:16px" :id="rowData.sa_itemgroupid" />
+      <add-btn ref="add" v-if="tool.checkAuth($route.name,'insert')" @onSuccess="getDetail" style="margin-bottom:16px" :id="rowData.sa_itemgroupid" />
       <tableLayout v-if="dialogTableVisible" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="40vh" fixedName="operation">
         <template v-slot:customcol="scope">
             <span v-if="scope.column.data[scope.column.columnname]">{{scope.column.data[scope.column.columnname]}}</span>
@@ -11,7 +11,7 @@
         <template v-slot:opreation="scope">
           <div style="display:flex;justify-content:space-around">
             <Del type="detail" v-if="tool.checkAuth($route.name,'delete')" :id="rowData.sa_itemgroupid" @deleteSuccess="getDetail" :detailId="scope.data.sa_itemgroupmxid"/>
-            <editBtn v-if="tool.checkAuth($route.name,'update')" :id="rowData.sa_itemgroupid" @onSuccess="getDetail" :rowData="scope.data"/>
+            <!-- <editBtn v-if="tool.checkAuth($route.name,'update')" :id="rowData.sa_itemgroupid" @onSuccess="getDetail" :rowData="scope.data"/> -->
           </div>
         </template>
       </tableLayout>

src/HDrpManagement/ProductGroupMag/modules/addGroupDetailBtn.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-button type="primary" size="small" @click="dialogTableVisible=true">新增商品</el-button>
+    <el-button type="primary" size="small" @click="addBtn">新增商品</el-button>
     <el-dialog title="产品组商品新增" append-to-body :visible.sync="dialogTableVisible" width="50%">
-      <table1 v-if="productList()" @checkboxCallBack="checkboxCallBack" :layout="tablecols" :data="productList()" :opwidth="200" :custom="false" :height="300" :checkbox="true">
+      <table1 v-if="productList" @checkboxCallBack="checkboxCallBack" :layout="tablecols" :data="productList" :opwidth="200" :custom="false" :height="300" :checkbox="true">
       </table1>
       <span slot="footer" class="dialog-footer">
         <div>
@@ -22,10 +22,10 @@ export default {
     return {
       dialogTableVisible:false,
       product:[],
-      tablecols:[]
+      tablecols:[],
+      productList:''
     }
   },
-  inject: ['productList'],
   props:['id'],
   watch: {
     
@@ -62,6 +62,22 @@ export default {
     },
     checkboxCallBack(data) {
       this.product = data
+    },
+    async addBtn() {
+      this.dialogTableVisible=true
+      let res = await this.$api.requested({
+        "id": "20220923112503",
+        "version":1,
+        "content": {
+          "nocache":true,
+          "sa_itemgroupid":this.id,
+          "where":{
+              "condition":""
+          }
+        }
+      })
+      console.log(res);
+      this.productList = res.data
     }
   }
 }

src/HDrpManagement/ProductGroupMag/modules/list.vue

@@ -81,6 +81,8 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      console.log(res.data);
+      
     },
     searchActive(data) {
       this.params.content.where.condition = data

src/HManagement/marketing/agent/modules/edit_agent.vue

@@ -176,7 +176,6 @@ export default {
         }
       })
       this.sys_enterpriseid = res.data.sys_enterpriseid
-      
       let arr = ['province','city','county']
       res.data.value = []
       arr.forEach(e=>{

src/HManagement/marketing/agent/modules/saleclass/index.vue

@@ -14,6 +14,7 @@ import addSaleClass from './modules/addSaleClass'
 import Del from './modules/del'
 export default {
   name: '',
+  inject: ['sys_enterpriseid'],
   data() {
     return {
       saleClassList:'',
@@ -36,7 +37,8 @@ export default {
         "id": 20220924134502,
         "content": {
             "pageNumber": 1,
-            "pageSize": 20,
+            "pageSize": 999999999,
+            "sys_enterpriseid": this.sys_enterpriseid(),
             "where": {
                 "condition": ""
             }

src/SDrpManagement/ProductGroup/index.vue

@@ -11,6 +11,7 @@
             <p class="title">商品组名称：{{item.groupname}}</p>
             <p class="descript">商品组编号：{{item.groupnum}}</p>
             <p class="descript">所属营销分类：{{item.itemclassname}}</p>
+            <p class="price descript">价格：<span style="color:red;font-size:18px">{{item.minprice}}</span>~<span style="color:red;font-size:14px">{{item.maxprice}}</span></p>
           </div>
         </div>
       </div>
@@ -135,7 +136,7 @@ export default {
 }
 .group .group-list .group-item {
   width: 212px;
-  height: 250px;
+  height: 270px;
   background: #ffffff;
   transition: all 0.1s ease-in;
   margin: 0 16px 16px 0;

src/SManagement/orderclue/index.vue

@@ -19,7 +19,7 @@
         <move :data="[scope.data.data.sat_orderclueid]" 
               @updataList="updataList" 
               :teamList="teamList"  
-              v-if="userInfo.isAuth == 1 && userInfo.isAuth == 1 ? scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' : ''"></move>
+              v-if="userInfo.isAuth == 1 ? scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' : ''"></move>
       </template>
     </list>
   </div>

src/SManagement/sales_forecast/index.vue

@@ -29,7 +29,7 @@
         </template>
         <template v-slot:opreation="scope">
           <el-button type="text" size="small" @click="addBuill(scope)"
-            v-if="tool.checkAuth($route.name,'create_sales')" :disabled="scope.data.status == '结束'">创建提报</el-button>
+            v-if="tool.checkAuth($route.name,'create_sales')" :disabled="scope.data.status == '结束' || new Date().valueOf() > new Date(scope.data.enddate).valueOf()">创建提报</el-button>
         </template>
       </tableLayout>
       <pagination :total="total" :pageSize="params.content.pageSize" :currentPage="params.content.pageNumber"