1.1 0911验收bug 刷新按钮位置调整、添加修改自定义耗材屏蔽跟随设备方式

src/views/equip-management/box-manage/index.vue

@@ -35,7 +35,7 @@
 					</el-form-item>
 				</el-form>
 
-				<el-button type="primary" circle class="el-icon-refresh-right refresh-button" @click="refreshList()" style="margin-right: 250px" ></el-button>
+				<el-button type="primary" circle class="el-icon-refresh-right refresh-button" @click="refreshList()" style="margin-right: 70px" ></el-button>
 
 				<el-button type="danger" class="add-new-button" @click="addBoxFnc()" v-if="modeShow === 'all'">新 建</el-button>
 

src/views/oa-management/consumble-watch/operate-consumble/index.vue

@@ -73,8 +73,8 @@
       </el-form-item>
 <!--      v-if="type=='edit' && operateConsumbleForm.consumption_algorithm_id==5" disabled=""-->
       <el-form-item label="耗材归属" >
-        {{type=='edit'}}{{operateConsumbleForm.consumption_algorithm_id==5}}
-        <el-select
+<!--        {{type=='edit'}}{{operateConsumbleForm.consumption_algorithm_id==5}}-->
+        <el-select v-if="type=='edit' && operateConsumbleForm.consumption_algorithm_id==5" disabled
           v-model="operateConsumbleForm.ascription"
           placeholder="请选择"
         >
@@ -85,10 +85,32 @@
             :key="item.value"
           ></el-option>
         </el-select>
+          <el-select v-if="type=='edit' && operateConsumbleForm.consumption_algorithm_id !=5"
+                     v-model="operateConsumbleForm.ascription"
+                     placeholder="请选择"
+          >
+              <el-option :disabled="item.disabled"
+                         v-for="item in ascriptionOption"
+                         :label="item.label"
+                         :value="item.value"
+                         :key="item.value"
+              ></el-option>
+          </el-select>
+          <el-select v-if="type=='create'"
+                     v-model="operateConsumbleForm.ascription"
+                     placeholder="请选择"
+          >
+              <el-option :disabled="item.disabled"
+                         v-for="item in ascriptionOption"
+                         :label="item.label"
+                         :value="item.value"
+                         :key="item.value"
+              ></el-option>
+          </el-select>
       </el-form-item>
       <el-form-item label="耗材算法">
         <template>
-          <el-select
+          <el-select v-if="type=='edit' && operateConsumbleForm.consumption_algorithm_id==5" disabled
             v-model="operateConsumbleForm.consumption_algorithm_id"
             @visible-change="consumptionAlgorithmListFnc"
             placeholder="请选择"
@@ -100,6 +122,30 @@
               :key="+new Date() + index"
             ></el-option>
           </el-select>
+            <el-select v-if="type=='edit' && operateConsumbleForm.consumption_algorithm_id!=5"
+                       v-model="operateConsumbleForm.consumption_algorithm_id"
+                       @visible-change="consumptionAlgorithmListFnc"
+                       placeholder="请选择"
+            >
+                <el-option :disabled="item.disabled"
+                           v-for="(item, index) in consumptionAlgorithmOption"
+                           :label="item.consumption_algorithm"
+                           :value="item.id"
+                           :key="+new Date() + index"
+                ></el-option>
+            </el-select>
+            <el-select v-if="type=='create'"
+                       v-model="operateConsumbleForm.consumption_algorithm_id"
+                       @visible-change="consumptionAlgorithmListFnc"
+                       placeholder="请选择"
+            >
+                <el-option :disabled="item.disabled"
+                           v-for="(item, index) in consumptionAlgorithmOption"
+                           :label="item.consumption_algorithm"
+                           :value="item.id"
+                           :key="+new Date() + index"
+                ></el-option>
+            </el-select>
 
         </template>
       </el-form-item>