暂存

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

@@ -13,7 +13,7 @@
         <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.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>

src/HDrpManagement/ProductMag/modules/productGroup.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <productGroupAdd v-if="tool.checkAuth($route.name,'addGroup')" :data="data" @onSuccess="listData"></productGroupAdd>
+    <productGroupAdd v-if="tool.checkAuth($route.name,'addGroup')" :data="data" @onSuccess="listData" ></productGroupAdd>
     <div style="margin-top: 15px">
       <el-table
           :data="list"
@@ -15,6 +15,19 @@
             prop="groupname"
             label="商品组名称">
         </el-table-column>
+        <el-table-column
+            label="操作"
+            width="100px">
+          <template slot-scope="scope">
+            <el-popconfirm
+                title="确定删除该商品组吗？"
+                @confirm="deleteGroup(scope.row)"
+            >
+              <el-button slot="reference" type="text" size="mini" >删 除</el-button>
+            </el-popconfirm>
+
+          </template>
+        </el-table-column>
       </el-table>
     </div>
 
@@ -51,6 +64,18 @@ export default {
       this.param.content.itemid = this.$route.query.id
       const res = await this.$api.requested(this.param)
       this.list = res.data
+    },
+    async deleteGroup(item){
+      const res = await this.$api.requested({
+        "id": 20230404111404,
+        "content": {
+          "itemid": this.$route.query.id,
+          "sa_itemgroupid": item.sa_itemgroupid
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.listData()
+      })
     }
   },
   mounted() {

src/HDrpManagement/ProductMag/modules/productGroupAdd.vue

@@ -105,9 +105,14 @@ export default {
   },
   methods:{
     onShow(){
-      this.drawer = true
-      this.listData()
-      this.queryBrand()
+      if (this.data.brand.length > 0){
+        this.drawer = true
+        this.listData()
+        this.brandList = this.data.brand
+      }else {
+        this.$message.error('请先设置营销分类');
+      }
+
     },
     async listData(){
       this.param.content.itemid = this.$route.query.id
@@ -130,7 +135,6 @@ export default {
       this.listData()
     },
     rowClick(val){
-      console.log(val,'选择商品组')
       this.onSubmit(val)
     },
     async onSubmit(item){
@@ -155,14 +159,6 @@ export default {
       this.drawer = false
       this.$emit('onSuccess')
     },
-    /*获取品牌*/
-    async queryBrand(){
-      const res = await this.$api.requested({
-        "id":20220922085103,
-        "content":{}
-      })
-      this.brandList = res.data
-    },
     /*创建商品组*/
     creatGroup(){
       console.log(this.sa_brandid)

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

@@ -631,13 +631,18 @@ export default {
       })
     },
     rowChange (val,index) {
+      if (val.qty > val.orderminqty){
+         if ((val.qty-val.orderminqty)/val.orderaddqty > 0){
+           let k = ((val.qty-val.orderminqty)/val.orderaddqty).toFixed(0)
+           val.qty = k * val.orderaddqty + val.orderminqty
+         }
+      }
       let that = this
       if(this.time !== null){
         clearTimeout(this.time);
       }
       this.time = setTimeout(() => {
         this.$set(this.tableData,index,val)
-        console.log(this.tableData,'tableData')
         that.updateOrder({
           "sa_orderid": this.data.sa_orderid, //订单ID
           "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -36,7 +36,7 @@
       <tableLayout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="amount" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
-            <el-input-number v-model="scope.column.data.qty" size="mini" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty"  label="描述文字" @change="numChange(scope.column.data.qty,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage')  "></el-input-number>
+            <el-input-number  v-model="scope.column.data.qty" size="mini" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty"  label="描述文字" @change="numChange(scope.column.data.qty,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage')  "></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'price'">
             <el-input v-model="scope.column.data.price" size="mini"    @change="priceChange(scope.column.data.price,scope.$index,scope.column.data)" :disabled="!disabled || !tool.checkAuth($route.name,'productSetManage') "></el-input>
@@ -291,7 +291,16 @@ export default {
     },
     /*修改商品数量*/
     numChange(val,index,data){
-      data.qty = val.toFixed(2)
+      if (val < data.orderminqty){
+        data.qty = data.orderminqty.toFixed(2)
+      }else {
+        if ((val - data.orderminqty)/data.orderaddqty > 0){
+          let k = ((val - data.orderminqty)/data.orderaddqty).toFixed(0)
+          data.qty = k * data.orderaddqty + data.orderminqty
+        }else {
+          data.qty = val.toFixed(2)
+        }
+      }
       data.amount = (data.price * data.qty).toFixed(2)
       this.$set(this.list,index,data)
       this.onChangQty(data,data.qty)

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -438,6 +438,12 @@ export default {
     //   this.$emit('onSuccess')
     // },
     qtyChange (val,index) {
+      if (val.qty > val.orderminqty){
+        if ((val.qty-val.orderminqty)/val.orderaddqty > 0){
+          let k = ((val.qty-val.orderminqty)/val.orderaddqty).toFixed(0)
+          val.qty = k * val.orderaddqty + val.orderminqty
+        }
+      }
       let that = this
       this.$set(this.tableData,index,val)
       // // 防抖

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -455,6 +455,12 @@ export default {
     //   this.$emit('onSuccess')
     // },
     qtyChange (val,index) {
+      if (val.qty > val.orderminqty){
+        if ((val.qty-val.orderminqty)/val.orderaddqty > 0){
+          let k = ((val.qty-val.orderminqty)/val.orderaddqty).toFixed(0)
+          val.qty = k * val.orderaddqty + val.orderminqty
+        }
+      }
       let that = this
       this.$set(this.tableData,index,val)
       // // 防抖