修复bug,新增装箱数

src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -8,11 +8,13 @@
         <el-descriptions-item  label="状态"><span :style="basic.status == '审核' ? 'color:#52C41A' : 'color:#000000'">{{ basic.status}}</span></el-descriptions-item>
         <el-descriptions-item  label="品号">{{ basic.erpitemno}}</el-descriptions-item>
         <el-descriptions-item  label="品名">{{ basic.erpitemname}}</el-descriptions-item>
-        <el-descriptions-item  label="外形尺寸">长:{{ basic.length}};宽:{{basic.width}};高:{{basic.height}}</el-descriptions-item>
+<!--        <el-descriptions-item  label="外形尺寸">长:{{ basic.length}};宽:{{basic.width}};高:{{basic.height}}</el-descriptions-item>-->
         <el-descriptions-item  label="上/下架"><span :style="basic.isonsale ? 'color:#3874f6' : 'color:#333333'">{{ basic.isonsale ? '上架' : '下架'}}</span></el-descriptions-item>
         <el-descriptions-item  label="型号">{{ basic.model}}</el-descriptions-item>
         <el-descriptions-item  label="规格尺寸">{{ basic.spec}}</el-descriptions-item>
         <el-descriptions-item  label="计量单位组">{{ basic.unitname}}</el-descriptions-item>
+        <el-descriptions-item  label="辅助单位">{{ basic.auxunitname}}</el-descriptions-item>
+        <el-descriptions-item  label="装箱数">{{ basic.packqty}}</el-descriptions-item>
         <el-descriptions-item  label="营销类别"><span v-for="item in basic.itemclass" :key="item.index">{{ item.itemclassname}},</span></el-descriptions-item>
         <el-descriptions-item  label="领域"><span v-for="item in basic.tradefield" :key="item.index">{{ item.tradefield}},</span></el-descriptions-item>
         <el-descriptions-item  label="品牌">{{ basic.brand && basic.brand[0]?basic.brand[0].brandname:''}}</el-descriptions-item>
@@ -26,7 +28,7 @@
         <el-descriptions-item  label="条形码">{{ basic.barcode}}</el-descriptions-item>
         <el-descriptions-item  label="是否序列号管理">{{ basic.skucontrol ? '是' : '否'}}</el-descriptions-item>
         <el-descriptions-item  label="是否批次管理">{{ basic.batchcontrol ? '是' : '否'}}</el-descriptions-item>
-        <el-descriptions-item  label="建议零售价">{{ tool.formatAmount(basic.price,2)}}</el-descriptions-item>
+<!--        <el-descriptions-item  label="建议零售价">{{ tool.formatAmount(basic.price,2)}}</el-descriptions-item>-->
         <el-descriptions-item  label="压力等级">{{ basic.pressure}}</el-descriptions-item>
         <el-descriptions-item  label="蝶板驱动">{{ basic.butterflyplatedrive}}</el-descriptions-item>
         <el-descriptions-item  label="连接形式">{{ basic.connection}}</el-descriptions-item>

src/HDrpManagement/ProductMag/modules/add.vue

@@ -17,7 +17,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="ERP品号" prop="erpitemno">
-                <el-input v-model="form.erpitemno" placeholder="输入ERP品号"></el-input>
+                <el-input v-model="form.erpitemno" placeholder="输入ERP品号" @change="erpitemnoChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -35,6 +35,11 @@
                 <el-input v-model="form.spec" placeholder="输入产品规格"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="装箱数" prop="packqty">
+                <el-input v-model="form.packqty" placeholder="输入装箱数"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="辅助单位">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.isauxunit" @change="isauxunitChange">是否需要辅助单位</el-checkbox>
@@ -358,7 +363,8 @@ export default {
         "erpitemname": "",
         "specalnote": "",
         "prodline": "",
-        "device": ""
+        "device": "",
+        "packqty":'1'
       },
       rules:{
          itemno: [
@@ -550,7 +556,8 @@ export default {
             "weight": '', //可选
             "height": '', //可选
             "width": '', //可选
-            "length": '' //可选
+            "length": '', //可选
+            "packqty":'1',
 
       }
     },
@@ -611,12 +618,17 @@ export default {
         "erpitemname": "",
         "specalnote": "",
         "prodline": "",
-        "device": ""
+        "device": "",
+        "packqty":"1"
       }
     },
     itemnoChange(){
-      console.log(this.form.itemno)
+      this.form.itemno=this.form.itemno.replace(/^\s+|\s+$/g,'')
+    },
+    erpitemnoChange(){
+      this.form.erpitemno = this.form.erpitemno.replace(/^\s+|\s+$/g,'')
     }
+
   },
   mounted () {
     

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -7,7 +7,7 @@
           <el-form label-position="right" label-width="90px" :model="form" :rules="rules" ref="form" size="small">
             <el-col :span="12">
               <el-form-item label="品号" prop="itemno">
-                <el-input v-model="form.itemno" placeholder="输入产品编号"></el-input>
+                <el-input v-model="form.itemno" placeholder="输入产品编号" @change="itemnoChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -17,7 +17,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="ERP品号" prop="erpitemno">
-                <el-input v-model="form.erpitemno" placeholder="输入ERP品号"></el-input>
+                <el-input v-model="form.erpitemno" placeholder="输入ERP品号" @change="erpitemnoChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -35,6 +35,11 @@
                 <el-input v-model="form.spec" placeholder="输入产品规格"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="装箱数" prop="packqty">
+                <el-input v-model="form.packqty" placeholder="输入装箱数"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="辅助单位">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.isauxunit" @change="isauxunitChange">是否需要辅助单位</el-checkbox>
@@ -637,6 +642,12 @@ export default {
     clearCover () {
       this.queryMain()
     },
+    itemnoChange(){
+      this.form.itemno=this.form.itemno.replace(/^\s+|\s+$/g,'')
+    },
+    erpitemnoChange(){
+      this.form.erpitemno = this.form.erpitemno.replace(/^\s+|\s+$/g,'')
+    }
   },
   mounted () {
     

src/HDrpManagement/contractManage/modules/detail.vue

@@ -50,7 +50,7 @@
         <!--产品明细折扣表-->
         <productDetailList :data="mainData" :isLeader="isLeader" ref="productDetailList" v-if="mainData.type == '框架'" @priceChange="queryMainData">
           <importFile
-            v-if="tool.checkAuth($route.name,'exportProduct')"
+            v-if="tool.checkAuth($route.name,'exportProduct') && isLeader"
             slot="export"
             ref="importFile"
             class="inline-16"

src/HManagement/department/staff/list/modules/add.vue

@@ -54,11 +54,14 @@
                   node-key="id"
                   default-expand-all
                   highlight-current
-                  :expand-on-click-node="false">
+                  :expand-on-click-node="false"
+                  @node-click="nodeClick"
+                >
                   <span class="custom-tree-node" slot-scope="{ node, data }">
                     <span>{{ node.label }}</span>
                     <span>
-                      <el-button size="small" type="text" @click="selectDep(data,visible=false)">选 择</el-button>
+                      <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-if="data.departmentid === pointValue" style="color: #FFFFFF">选 择</el-button>
+                      <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-else >选 择</el-button>
                     </span>
                   </span>
                 </el-tree>
@@ -217,7 +220,8 @@ export default {
         "remarks":"",
         "roleids":[]
       },
-      options:[]
+      options:[],
+      pointValue:''
     }
   },
   methods:{
@@ -328,6 +332,9 @@ export default {
     },
     onClose () {
       this.$refs['roleForm'].resetFields()
+    },
+    nodeClick(val){
+      this.pointValue = val.departmentid
     }
   }
 }

src/HManagement/department/staff/list/modules/edit.vue

@@ -55,11 +55,13 @@
                   node-key="id"
                   default-expand-all
                   highlight-current
+                  @node-click="nodeClick"
                   :expand-on-click-node="false">
                   <span class="custom-tree-node" slot-scope="{ node, data }">
                     <span>{{ node.label }}</span>
                     <span>
-                      <el-button size="small" type="text" @click="selectDep(data,visible=false)">选 择</el-button>
+                      <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-if="data.departmentid === pointValue" style="color: #FFFFFF">选 择</el-button>
+                      <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-else >选 择</el-button>
                     </span>
                   </span>
                 </el-tree>
@@ -165,7 +167,8 @@ export default {
         "statue":0,
       },
       value:[],
-      deplist:[]
+      deplist:[],
+      pointValue:''
     }
   },
   methods:{
@@ -265,6 +268,9 @@ export default {
     // 监听汇报对象选择
     selectMenber (data) {
       this.form.reporthrid = data.hrid
+    },
+    nodeClick(val){
+      this.pointValue = val.departmentid
     }
   }
 }

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -34,6 +34,7 @@
         <el-input-number v-model="count" :min="selectProduct.orderminqty" :step="selectProduct.orderaddqty" @change="changeQty" size="small" label="描述文字"></el-input-number>
         <span style="color:#888;font-size: 14px;margin-left: 10px">起订量：{{selectProduct.orderminqty}}</span>
         <span style="color:#888;font-size: 14px;margin-left: 10px">增量：{{selectProduct.orderaddqty}}</span>
+        <span style="color:#888;font-size: 14px;margin-left: 10px">装箱数：{{selectProduct.packqty}}</span>
         <span style="color:#888;font-size: 14px;margin-left: 10px">库存：
           <template v-if="usertype === 0 || usertype === 1">
             <span>{{ selectProduct.cansaleqty }}</span>

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -196,7 +196,14 @@ export default {
       let team = data.filter(e=>{
         return e.isleader !== 1
       })
-      if (team.length === 0) return true
+      let flag = 0
+      for (let i=0;i<team.length;i++){
+        if (team[i].isdefault !== 1){
+          flag = 1
+          break
+        }
+      }
+      if (team.length === 0 || flag === 0) return true
     },
     setClick(row){
       console.log(row)