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

src/HDrpManagement/logistics/details/index.vue

@@ -29,7 +29,7 @@
         </div>
         <div  slot="slot2">
           <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>
+          <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/orderManage/details/index.vue

@@ -41,7 +41,7 @@
             <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>

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

@@ -27,28 +27,6 @@
             <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>
@@ -129,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
     },

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -7,7 +7,7 @@
       </ul>
       <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-new">
         <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
@@ -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) {