From 15aa8f68d5028624648e35e8c065693e3b44b3c2 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 14 Feb 2025 17:02:06 +0800
Subject: [PATCH] =?UTF-8?q?2/14=20=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A11.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue     | 206 +++++++++++++++++++----
 src/views/basic/product/productEdit.vue | 208 +++++++++++++++++++-----
 2 files changed, 339 insertions(+), 75 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 32bd8c69..63c91e09 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -1317,44 +1317,67 @@
                       <el-col
                         :span="12"
                         class="el-col"
-                        v-if="productRemarkSet.remarkEnable1"
+                        v-if="productRemarkSet.remarkEnable6"
                       >
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                            >{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
                             >
                           </div>
-                          <el-input
-                            style="width: 65%"
-                            size="small"
-                            :disabled="true"
-                            splaceholder="请输入内容"
-                            v-model="editQuery.basicPrductRemak1"
-                          ></el-input>
+                          <el-select v-model="editQuery.basicPrductRemak6" style="width: 65%"
+                                     placeholder="选择材料类别"   :disabled="true">
+                            <el-option label="卫生材料" :value="1"></el-option>
+                            <el-option label="低值易耗" :value="2"></el-option>
+                            <el-option label="其他材料" :value="3"></el-option>
+                          </el-select>
                         </div>
                       </el-col>
-
                       <el-col
                         :span="12"
                         class="el-col"
-                        v-if="productRemarkSet.remarkEnable2"
+                        v-if="productRemarkSet.remarkEnable1"
                       >
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                            >{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
                             >
                           </div>
-                          <el-input
-                            style="width: 65%"
-                            size="small"
-                            :disabled="true"
-                            splaceholder="请输入内容"
-                            v-model="editQuery.basicPrductRemak2"
-                          ></el-input>
+                          <el-select v-model="editQuery.basicPrductRemak2" style="width: 65%"
+                                     placeholder="选择材料小类" :disabled="true">
+
+                            <el-option label="--请选择--" :value="null" disabled></el-option>
+                            <div v-if="editQuery.basicPrductRemak6 == 1">
+                              <el-option label="创面损伤" :value="253"></el-option>
+                              <el-option label="功能敷料" :value="254"></el-option>
+                              <el-option label="生物材料" :value="255"></el-option>
+                              <el-option label="手术用品" :value="256"></el-option>
+                              <el-option label="粘贴材料" :value="257"></el-option>
+                              <el-option label="护创材料" :value="258"></el-option>
+                              <el-option label="医用纺织品" :value="259"></el-option>
+                              <el-option label="医用非织造布" :value="260"></el-option>
+                              <el-option label="高值耗材" :value="268"></el-option>
+                              <el-option label="一次性材料" :value="267"></el-option>
+                            </div>
+
+                            <div v-if="editQuery.basicPrductRemak6 == 2">
+                              <el-option label="手术器械" :value="261"></el-option>
+                              <el-option label="医疗仪器器械(简易类)" :value="262"></el-option>
+                              <el-option label="口腔材料" :value="263"></el-option>
+                              <el-option label="仪器设备" :value="264"></el-option>
+                              <el-option label="低值易耗" :value="269"></el-option>
+                            </div>
+
+                            <div v-if="editQuery.basicPrductRemak6 == 3">
+                              <el-option label="其他材料" :value="337"></el-option>
+                            </div>
+
+                          </el-select>
                         </div>
                       </el-col>
+
+
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
@@ -1371,14 +1394,13 @@
                           </div>
                           <el-input
                             style="width: 65%"
-                            :disabled="true"
                             size="small"
+                            :disabled="true"
                             splaceholder="请输入内容"
                             v-model="editQuery.basicPrductRemak3"
                           ></el-input>
                         </div>
                       </el-col>
-
                       <el-col
                         :span="12"
                         class="el-col"
@@ -1399,6 +1421,27 @@
                           ></el-input>
                         </div>
                       </el-col>
+
+                      <!--<el-col-->
+                      <!--  :span="12"-->
+                      <!--  class="el-col"-->
+                      <!--  v-if="productRemarkSet.remarkEnable4"-->
+                      <!--&gt;-->
+                      <!--  <div class="text item">-->
+                      <!--    <div class="itemTag">-->
+                      <!--      <span-->
+                      <!--      >{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span-->
+                      <!--      >-->
+                      <!--    </div>-->
+                      <!--    <el-input-->
+                      <!--      style="width: 65%"-->
+                      <!--      :disabled="true"-->
+                      <!--      size="small"-->
+                      <!--      splaceholder="请输入内容"-->
+                      <!--      v-model="editQuery.basicPrductRemak4"-->
+                      <!--    ></el-input>-->
+                      <!--  </div>-->
+                      <!--</el-col>-->
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
@@ -1426,12 +1469,12 @@
                       <el-col
                         :span="12"
                         class="el-col"
-                        v-if="productRemarkSet.remarkEnable6"
+                        v-if="productRemarkSet.remarkEnable7"
                       >
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                            >{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1439,7 +1482,7 @@
                             size="small"
                             :disabled="true"
                             splaceholder="请输入内容"
-                            v-model="editQuery.basicPrductRemak6"
+                            v-model="editQuery.basicPrductRemak7"
                           ></el-input>
                         </div>
                       </el-col>
@@ -1449,12 +1492,12 @@
                       <el-col
                         :span="12"
                         class="el-col"
-                        v-if="productRemarkSet.remarkEnable7"
+                        v-if="productRemarkSet.remarkEnable8"
                       >
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                            >{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1462,7 +1505,7 @@
                             size="small"
                             :disabled="true"
                             splaceholder="请输入内容"
-                            v-model="editQuery.basicPrductRemak7"
+                            v-model="editQuery.basicPrductRemak8"
                           ></el-input>
                         </div>
                       </el-col>
@@ -1470,12 +1513,12 @@
                       <el-col
                         :span="12"
                         class="el-col"
-                        v-if="productRemarkSet.remarkEnable8"
+                        v-if="productRemarkSet.remarkEnable9"
                       >
                         <div class="text item">
                           <div class="itemTag">
                             <span
-                            >{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
+                            >{{ productRemarkSet.remarkTitle9 }}:&nbsp;</span
                             >
                           </div>
                           <el-input
@@ -1483,11 +1526,93 @@
                             size="small"
                             :disabled="true"
                             splaceholder="请输入内容"
-                            v-model="editQuery.basicPrductRemak8"
+                            v-model="editQuery.basicPrductRemak9"
                           ></el-input>
                         </div>
                       </el-col>
                     </el-row>
+                    <el-row :gutter="20" class="el-row" type="flex">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable10"
+                      >
+                        <div class="text item">
+                          <div class="itemTag">
+                            <span
+                            >{{ productRemarkSet.remarkTitle10 }}:&nbsp;</span
+                            >
+                          </div>
+                          <el-input
+                            style="width: 65%"
+                            size="small"
+                            :disabled="true"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.basicPrductRemak10"
+                          ></el-input>
+                        </div>
+                      </el-col>
+
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable11"
+                      >
+                        <div class="text item">
+                          <div class="itemTag">
+                            <span
+                            >{{ productRemarkSet.remarkTitle11 }}:&nbsp;</span
+                            >
+                          </div>
+                          <el-select v-model="editQuery.basicPrductRemak11" style="width: 65%"
+                                     placeholder="选择病案名称类型" :disabled="true">
+                            <el-option label="检查用一次性医用材料费" :value="56"></el-option>
+                            <el-option label="治疗用一次性医用材料费" :value="57"></el-option>
+                            <el-option label="手术用一次性医用材料费" :value="58"></el-option>
+                            <el-option label="其他类_其他费" :value="59"></el-option>
+                          </el-select>
+                        </div>
+                      </el-col>
+                    </el-row>
+                    <el-row :gutter="20" class="el-row" type="flex">
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable12"
+                      >
+                        <div class="text item">
+                          <div class="itemTag">
+                            <span
+                            >{{ productRemarkSet.remarkTitle12 }}:&nbsp;</span
+                            >
+                          </div>
+                          <el-select v-model="editQuery.basicPrductRemak12" style="width: 65%"
+                                     placeholder="选择医保结算" :disabled="true">
+                            <el-option label="是" :value="1"></el-option>
+                            <el-option label="否" :value="0"></el-option>
+                          </el-select>
+                        </div>
+                      </el-col>
+
+                      <el-col
+                        :span="12"
+                        class="el-col"
+                        v-if="productRemarkSet.remarkEnable13"
+                      >
+                        <div class="text item">
+                          <div class="itemTag">
+                            <span
+                            >{{ productRemarkSet.remarkTitle13 }}:&nbsp;</span
+                            >
+                          </div>
+                          <el-select v-model="editQuery.basicPrductRemak13" style="width: 65%"
+                                     placeholder="选择是否医保范围" :disabled="true">
+                            <el-option label="是" :value="1"></el-option>
+                            <el-option label="否" :value="0"></el-option>
+                          </el-select>
+                        </div>
+                      </el-col>
+                    </el-row>
                   </el-collapse-item>
 
                   <el-collapse-item name="4">
@@ -2128,10 +2253,12 @@ export default {
               this.isUseDyCheck = true;
             }
           });
+
           this.productType = this.detailList[0].productType;
           this.editQuery.versionNumber = this.detailList[0].versionNumber
           this.editQuery.originUuid = this.detailList[0].originUuid
           this.editQuery.destinyType = this.detailList[0].destinyType
+
         })
         .catch(() => {
           this.loading = false;
@@ -2382,6 +2509,25 @@ export default {
       _this.getDetailList(ttquery);
       //获取关联第三方系统产品信息列表
       _this.getThirdSysDetail();
+      if (row.basicPrductRemak6 != null){
+        _this.editQuery.basicPrductRemak6 =   Number(row.basicPrductRemak6)
+      }
+      if (row.basicPrductRemak1 != null){
+        _this.editQuery.basicPrductRemak1 =   Number(row.basicPrductRemak1)
+      }
+      if (row.basicPrductRemak2 != null){
+        _this.editQuery.basicPrductRemak2 =   Number(row.basicPrductRemak2)
+      }
+      if (row.basicPrductRemak11 != null){
+        _this.editQuery.basicPrductRemak11 =   Number(row.basicPrductRemak11)
+      }
+      if (row.basicPrductRemak12 != null){
+        _this.editQuery.basicPrductRemak12 =   Number(row.basicPrductRemak12)
+      }
+      if (row.basicPrductRemak13 != null){
+        _this.editQuery.basicPrductRemak13 =   Number(row.basicPrductRemak13)
+      }
+
     },
 
 
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 806abb46..c4d36c07 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -227,103 +227,200 @@
 
 
         <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
+            <el-form-item :label="productRemarkSet.remarkTitle6+':'" prop="basicPrductRemak6">
+              <el-select v-model="editQuery.basicPrductRemak6" style="width: 80%"
+                         placeholder="选择材料类别" @change="changeLieBie()">
+                <el-option label="卫生材料" :value="1"></el-option>
+                <el-option label="低值易耗" :value="2"></el-option>
+                <el-option label="其他材料" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
-            <el-form-item :label="productRemarkSet.remarkTitle1+':'">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.basicPrductRemak1"
-              ></el-input>
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'" prop="basicPrductRemak1">
+              <el-select v-model="editQuery.basicPrductRemak1" style="width: 80%"
+                         placeholder="选择材料分类" >
+
+                <el-option label="--请选择--" :value="null" disabled></el-option>
+                <div v-if="editQuery.basicPrductRemak6 == 1">
+                  <el-option label="创面损伤" :value="83"></el-option>
+                  <el-option label="功能敷料" :value="84"></el-option>
+                  <el-option label="生物材料" :value="85"></el-option>
+                  <el-option label="手术用品" :value="86"></el-option>
+                  <el-option label="粘贴材料" :value="87"></el-option>
+                  <el-option label="护创材料" :value="88"></el-option>
+                  <el-option label="医用纺织品" :value="89"></el-option>
+                  <el-option label="医用非织造布" :value="90"></el-option>
+                  <el-option label="高值耗材" :value="95"></el-option>
+                  <el-option label="一次性材料" :value="96"></el-option>
+                </div>
+
+                <div v-if="editQuery.basicPrductRemak6 == 2">
+                  <el-option label="手术器械" :value="91"></el-option>
+                  <el-option label="医疗仪器器械(简易类)" :value="92"></el-option>
+                  <el-option label="口腔材料" :value="93"></el-option>
+                  <el-option label="仪器设备" :value="94"></el-option>
+                  <el-option label="低值易耗" :value="97"></el-option>
+                </div>
+
+
+                <div v-if="editQuery.basicPrductRemak6 == 3">
+                  <el-option label="其他材料" :value="101"></el-option>
+                </div>
+
+              </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
-            <el-form-item :label="productRemarkSet.remarkTitle2+':'">
+            <el-form-item :label="productRemarkSet.remarkTitle2+':'" prop="basicPrductRemak2">
+              <el-select v-model="editQuery.basicPrductRemak2" style="width: 80%"
+                         placeholder="选择材料小类" >
+
+                <el-option label="--请选择--" :value="null" disabled></el-option>
+                <div v-if="editQuery.basicPrductRemak6 == 1">
+                  <el-option label="创面损伤" :value="253"></el-option>
+                  <el-option label="功能敷料" :value="254"></el-option>
+                  <el-option label="生物材料" :value="255"></el-option>
+                  <el-option label="手术用品" :value="256"></el-option>
+                  <el-option label="粘贴材料" :value="257"></el-option>
+                  <el-option label="护创材料" :value="258"></el-option>
+                  <el-option label="医用纺织品" :value="259"></el-option>
+                  <el-option label="医用非织造布" :value="260"></el-option>
+                  <el-option label="高值耗材" :value="268"></el-option>
+                  <el-option label="一次性材料" :value="267"></el-option>
+                </div>
+
+                <div v-if="editQuery.basicPrductRemak6 == 2">
+                  <el-option label="手术器械" :value="261"></el-option>
+                  <el-option label="医疗仪器器械(简易类)" :value="262"></el-option>
+                  <el-option label="口腔材料" :value="263"></el-option>
+                  <el-option label="仪器设备" :value="264"></el-option>
+                  <el-option label="低值易耗" :value="269"></el-option>
+                </div>
+
+                <div v-if="editQuery.basicPrductRemak6 == 3">
+                  <el-option label="其他材料" :value="337"></el-option>
+                </div>
+
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
+            <el-form-item :label="productRemarkSet.remarkTitle3+':'" prop="basicPrductRemak3">
               <el-input
                 style="width: 80%"
                 size="small"
                 splaceholder="请输入内容"
-                v-model="editQuery.basicPrductRemak2"
+                type='number'
+                v-model="editQuery.basicPrductRemak3"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" class="edit-row">
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
-            <el-form-item :label="productRemarkSet.remarkTitle3+':'">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
+            <el-form-item :label="productRemarkSet.remarkTitle4+':'" prop="basicPrductRemak4">
               <el-input
                 style="width: 80%"
                 size="small"
                 splaceholder="请输入内容"
-                v-model="editQuery.basicPrductRemak3"
+                v-model="editQuery.basicPrductRemak4"
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
-            <el-form-item :label="productRemarkSet.remarkTitle4+':'">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
+            <el-form-item :label="productRemarkSet.remarkTitle5+':'" prop="basicPrductRemak5">
               <el-input
                 style="width: 80%"
                 size="small"
                 splaceholder="请输入内容"
-                v-model="editQuery.basicPrductRemak4"
+                v-model="editQuery.basicPrductRemak5"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" class="edit-row">
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
-            <el-form-item :label="productRemarkSet.remarkTitle5+':'">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
+            <el-form-item :label="productRemarkSet.remarkTitle7+':'" prop="basicPrductRemak7">
               <el-input
                 style="width: 80%"
                 size="small"
+                type='number'
                 splaceholder="请输入内容"
-                v-model="editQuery.basicPrductRemak5"
+                v-model="editQuery.basicPrductRemak7"
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
-            <el-form-item :label="productRemarkSet.remarkTitle6+':'">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
+            <el-form-item :label="productRemarkSet.remarkTitle8+':'" prop="basicPrductRemak8">
               <el-input
                 style="width: 80%"
                 size="small"
                 splaceholder="请输入内容"
-                v-model="editQuery.basicPrductRemak6"
+                v-model="editQuery.basicPrductRemak8"
+                disabled
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" class="edit-row">
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
-            <el-form-item :label="productRemarkSet.remarkTitle7+':'">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable9">
+            <el-form-item :label="productRemarkSet.remarkTitle9+':'" prop="basicPrductRemak9">
               <el-input
                 style="width: 80%"
                 size="small"
+                type='number'
                 splaceholder="请输入内容"
-                v-model="editQuery.basicPrductRemak7"
+                v-model="editQuery.basicPrductRemak9"
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
-            <el-form-item :label="productRemarkSet.remarkTitle8+':'">
-              <el-select
-                v-model="editQuery.basicPrductRemak8"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="请选择物价类别"
-                :remote-method="findHsflMethod"
-                :loading="loading"
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable10">
+            <el-form-item :label="productRemarkSet.remarkTitle10+':'" prop="basicPrductRemak10">
+              <el-input
                 style="width: 80%"
-              >
-                <el-option
-                  v-for="item in hsflOptions"
-                  :key="item.hsbm"
-                  :label="item.hsmc"
-                  :value="item.hsbm"
-                >
-                  <span style="float: left">{{ item.hsmc }}</span>
-                </el-option>
+                size="small"
+                placeholder="请输入内容"
+                type='number'
+                step="0.01"
+                v-model="editQuery.basicPrductRemak10"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable11">
+            <el-form-item :label="productRemarkSet.remarkTitle11+':'" prop="basicPrductRemak11">
+              <el-select v-model="editQuery.basicPrductRemak11" style="width: 80%"
+                         placeholder="选择病案名称类型" >
+                <el-option label="检查用一次性医用材料费" :value="56"></el-option>
+                <el-option label="治疗用一次性医用材料费" :value="57"></el-option>
+                <el-option label="手术用一次性医用材料费" :value="58"></el-option>
+                <el-option label="其他类_其他费" :value="59"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable12">
+            <el-form-item :label="productRemarkSet.remarkTitle12+':'" prop="basicPrductRemak12">
+              <el-select v-model="editQuery.basicPrductRemak12" style="width: 80%"
+                         placeholder="选择医保结算" >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable13">
+            <el-form-item :label="productRemarkSet.remarkTitle13+':'" prop="basicPrductRemak13">
+              <el-select v-model="editQuery.basicPrductRemak13" style="width: 80%"
+                         placeholder="选择是否医保范围" >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -876,9 +973,26 @@ export default {
     Treeselect
   },
   created() {
-    console.log("dayinshshhs", this.editQuery)
     this.useMutiChange(true)
     this.getThirdSysDetail();
+    if (this.editQuery.basicPrductRemak6 != null){
+      this.editQuery.basicPrductRemak6 =   Number(this.editQuery.basicPrductRemak6)
+    }
+    if (this.editQuery.basicPrductRemak1 != null){
+      this.editQuery.basicPrductRemak1 =   Number(this.editQuery.basicPrductRemak1)
+    }
+    if (this.editQuery.basicPrductRemak2 != null){
+      this.editQuery.basicPrductRemak2 =   Number(this.editQuery.basicPrductRemak2)
+    }
+    if (this.editQuery.basicPrductRemak11 != null){
+      this.editQuery.basicPrductRemak11 =   Number(this.editQuery.basicPrductRemak11)
+    }
+    if (this.editQuery.basicPrductRemak12!= null){
+      this.editQuery.basicPrductRemak12 =   Number(this.editQuery.basicPrductRemak12)
+    }
+    if (this.editQuery.basicPrductRemak13 != null){
+      this.editQuery.basicPrductRemak13 =   Number(this.editQuery.basicPrductRemak13)
+    }
     if (this.editQuery.isDateBy == 1) {
       this.editQuery.recentDateTime = this.editQuery.recentDateTime / 24;
     }
@@ -895,6 +1009,10 @@ export default {
     this.classifySearch("")
   },
   methods: {
+    changeLieBie(){
+      this.editQuery.basicPrductRemak1 = null
+      this.editQuery.basicPrductRemak2 = null
+    },
     classifyChange() {
       this.classifyChange(this.editQuery.flbm)
       let item = this.classifyList.find(item => item.code == this.editQuery.flbm)