业务库值守方式位置调整， 受到“是否设立业务库” 勾选值影响

src/views/system/dept/extend.vue

@@ -194,20 +194,6 @@
                 ></el-option>
               </el-select>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.yewd || type === org_type.zxywk" labelClassName="info_label_required" label="夜间值守方式" :contentStyle='contentStyle' :labelStyle='labelStyle'>
-              <el-select
-                clearable
-                v-model="dutyMode"
-                placeholder="请选择夜间值守方式"
-              >
-                <el-option
-                  v-for="dict in dict.type.duty_options"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-descriptions-item>
             <el-descriptions-item v-if="type === org_type.yewd" labelClassName="info_label_required" label="是否设立保管箱库" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-radio-group v-model="safeBox">
                 <el-radio :label="1">是</el-radio>
@@ -266,16 +252,14 @@
             </el-descriptions-item>
           </el-descriptions> -->
 
-          <el-descriptions class="margin-top" :column="3" v-if="(type === org_type.yewd)" size="medium" border>
-            <el-descriptions-item label="是否设立业务库"  :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
+          <el-descriptions class="margin-top" :column="3" v-if="(type === org_type.yewd  || type === org_type.zxywk)" size="medium" border>
+            <el-descriptions-item label="是否设立业务库" v-if="(type === org_type.yewd)"  :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
               <el-radio-group v-model="businessLibrary">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions class="margin-top" v-if="this.businessLibrary==1" :column="3" size="medium" border>
-            <el-descriptions-item label="业务库类型" :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
+            <el-descriptions-item label="业务库类型" v-if="this.businessLibrary==1" :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
               <el-select clearable v-model="businessLibraryType" placeholder="请选择业务库类型" >
                 <el-option
                   v-for="dict in dict.type.business_library_type"
@@ -284,8 +268,25 @@
                   :value="dict.value"
                 ></el-option>
               </el-select>
+            </el-descriptions-item>           
+          <el-descriptions-item v-if="this.businessLibrary==1 && (type === org_type.yewd || type === org_type.zxywk)" :labelStyle='labelStyle' labelClassName="info_label_required" label="业务库值守方式" >
+              <el-select
+                clearable
+                v-model="dutyMode"
+                placeholder="请选择业务库值守方式"
+              >
+                <el-option
+                  v-for="dict in dict.type.duty_options"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
             </el-descriptions-item>
-          </el-descriptions>
+          </el-descriptions>  
+          <!-- <el-descriptions class="margin-top" v-if="this.businessLibrary==1" :column="3" size="medium" border>
+          
+          </el-descriptions> -->
           <el-descriptions class="margin-top" :column="3" v-if="type === org_type.yewd"  size="medium" border>
             <el-descriptions-item label="是否配备保安人员" :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required" >
               <el-radio-group v-model="askari">
@@ -930,6 +931,7 @@ export default {
     businessLibrary(newValue){
       if (newValue==0){
         this.businessLibraryType=null;
+        this.dutyMode=null;
       }
     },
     askari(newValue){
@@ -1670,11 +1672,7 @@ export default {
       if (this.type === this.org_type.yewd && this.outsideArea == null) {
         this.$modal.msgError("所在位置不能为空，请选择所在位置");
         return false;
-      }
-      if ((this.type === this.org_type.yewd || this.type === this.org_type.zxywk)&& this.dutyMode == null) {
-        this.$modal.msgError("夜间值守不能为空，请选择夜间值守方式");
-        return false;
-      }
+      }      
       if (this.type === this.org_type.yewd && this.safeBox == null) {
         this.$modal.msgError("是否设立保管箱库不能为空，请选择是否设立保管箱库");
         return false;
@@ -1699,6 +1697,10 @@ export default {
         this.$modal.msgError("业务库类型不能为空，请选择业务库类型");
         return false;
       }
+      if ((this.type === this.org_type.yewd || this.type === this.org_type.zxywk)&& this.businessLibrary===1&& this.dutyMode == null) {
+        this.$modal.msgError("业务库值守不能为空，请选择业务库值守方式");
+        return false;
+      }
       // if ((this.type === this.org_type.jkzx)&&this.businessLibrary===1&&this.remoteControl==null) {
       //   this.$modal.msgError("出入口远程控制与授权不能为空，请选择出入口远程控制与授权");
       //   return false;