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

src/views/inout/PanelCreateOrderBizDetail.vue

@@ -3,13 +3,13 @@
     <el-row>
       <div style="margin: 0px 60px 10px auto; height: 35px;  float: right;">
         <el-button-group>
-          <el-button
+<!--          <el-button-->
-            type="primary"
+<!--            type="primary"-->
-            ref="mainTable"
+<!--            ref="mainTable"-->
-            @click.native.stop="selectWarlockBagFunction()"
+<!--            @click.native.stop="selectWarlockBagFunction()"-->
-            :loading="loading"
+<!--            :loading="loading"-->
-          >术式套包录入
+<!--          >术式套包录入-->
-          </el-button>
+<!--          </el-button>-->
           <el-button
             type="primary"
             ref="mainTable"

src/views/inout/receive/DialogNewReceive.vue

@@ -107,12 +107,12 @@
         <el-row>
           <div style="margin: 0px 60px 10px auto; height: 35px;  float: right;">
             <el-button-group>
-            <el-button
+<!--            <el-button-->
-              type="primary"
+<!--              type="primary"-->
-              @click.native.stop="selectWarlockBagFunction()"
+<!--              @click.native.stop="selectWarlockBagFunction()"-->
-              :loading="loading"
+<!--              :loading="loading"-->
-            >术式套包录入
+<!--            >术式套包录入-->
-            </el-button>
+<!--            </el-button>-->
             <el-button
               type="primary"
               @click.native.stop="selectProductFunction()"

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -96,12 +96,12 @@
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex">
             <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-              <el-button
+<!--              <el-button-->
-                type="primary"
+<!--                type="primary"-->
-                @click.native.stop="selectWarlockBagFunction()"
+<!--                @click.native.stop="selectWarlockBagFunction()"-->
-                :loading="loading"
+<!--                :loading="loading"-->
-              >术式套包录入
+<!--              >术式套包录入-->
-              </el-button>
+<!--              </el-button>-->
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
               </el-button>
               <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入计划单</el-button>-->

src/views/purchase/purOrder/purOrderEditDialog.vue

@@ -127,12 +127,12 @@
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex">
             <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-              <el-button
+<!--              <el-button-->
-                type="primary"
+<!--                type="primary"-->
-                @click.native.stop="selectWarlockBagFunction()"
+<!--                @click.native.stop="selectWarlockBagFunction()"-->
-                :loading="loading"
+<!--                :loading="loading"-->
-              >术式套包录入
+<!--              >术式套包录入-->
-              </el-button>
+<!--              </el-button>-->
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
               </el-button>
               <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>-->

src/views/purchase/purPlan/purPlanEditDialog.vue

@@ -94,12 +94,12 @@
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex">
             <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-              <el-button
+<!--              <el-button-->
-                type="primary"
+<!--                type="primary"-->
-                @click.native.stop="selectWarlockBagFunction()"
+<!--                @click.native.stop="selectWarlockBagFunction()"-->
-                :loading="loading"
+<!--                :loading="loading"-->
-              >术式套包录入
+<!--              >术式套包录入-->
-              </el-button>
+<!--              </el-button>-->
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
 <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入申购单</el-button>-->
             </el-button-group>