是否组套修改

src/views/basic/product/productEdit.vue

@@ -507,6 +507,23 @@
               </el-col>
             </el-row>
             <el-divider></el-divider>
+            <el-row>
+              <el-col span="5">
+                <span class="sptext">是否组套</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.isStack" style="width: 65%" placeholder="选择是否组套" clearable>
+                  <el-option label="是" :value="true"></el-option>
+                  <el-option label="否" :value="false"></el-option>
+                </el-select>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">是否组套</span>
+              </el-col>
+            </el-row>
+            <el-divider></el-divider>
             <el-row>
               <el-col span="5">
                 <span class="sptext">最小包装可使用次数</span>
@@ -758,7 +775,14 @@
 </template>
 
 <script>
-import {getYbHcflDetail,disableUdi, removeDiRl, removeRl, thirdSysDetail, updatetSingleUdiInfo} from "@/api/basic/product/udiRelevance";
+import {
+  getYbHcflDetail,
+  disableUdi,
+  removeDiRl,
+  removeRl,
+  thirdSysDetail,
+  updatetSingleUdiInfo
+} from "@/api/basic/product/udiRelevance";
 import {isBlank} from "@/utils/strUtil";
 import {filterByUuid} from "@/api/basic/product/udiInfo";
 import ProductSingleEdit from "@/views/basic/product/productSingleEdit";

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -263,6 +263,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8==true  && editQuery.basicPrductRemak6=='1'">
             <el-form-item :label="productRemarkSet.remarkTitle8+':'">
               <el-select
@@ -320,6 +322,20 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="是否组套:"
+              prop="isStack"
+              class="query-form-item"
+            >
+              <el-radio-group v-model="editQuery.isStack">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="分类编码:"
                           prop="flbm"
@@ -504,6 +520,7 @@ export default {
         purType: this.editQuery.purType,
         attributeType: this.editQuery.attributeType,
         hcType: this.editQuery.hcType,
+        isStack: this.editQuery.isStack,
         overStockNum: this.editQuery.overStockNum,
         lowStockNum: this.editQuery.lowStockNum,
         recentDateTime: this.editQuery.recentDateTime,

src/views/supplier/products/supAddDiProductSelectUdi.vue

@@ -290,6 +290,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item
               label="是否可集采:"
@@ -302,6 +303,18 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="是否组套:"
+              prop="isStack"
+              class="query-form-item"
+            >
+              <el-radio-group v-model="editQuery.isStack">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容"

src/views/supplier/products/supProductsAdd.vue

@@ -156,6 +156,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否组套" prop="isStack">
+              <el-select
+                v-model="newProductData.isStack"
+                placeholder="请选择"
+                clearable
+                style="width: 90%"
+              >
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1+':'" prop="basicPrductRemak1">