修改

src/components/duty/addDutyItem.vue

@@ -54,22 +54,24 @@
               :rules="[val => !!val || '请选择分类']" class="col-6 q-pr-lg q-pb-lg" />
           </div>
           <div class="col-6">
-            <q-select stack-label v-model="msg.DutyType" :options="dutyTypeList" color="primary" filled label="类型"
+            <q-select stack-label v-model="msg.DutyType" :options="msg.DutyCategory==1?dutyTypeList:dutyTypeList2" color="primary" filled label="类型"
               option-label="Name" option-value="Id" ref="DutyType"  emit-value
               map-options :rules="[val => !!val || '请选择类型']" />
           </div>
         </div>
-        <div class="row wrap">
-          <div class="col-6">
-            <q-input filled stack-label max-length="20" :dense="false" v-model="msg.ItemName" ref="ItemName"
-              class="col-6 q-pr-lg q-pb-lg" label="事项名称" :rules="[val => !!val || '请填写事项名称']" />
-          </div>
-          <div class="col-6">
+        <div class="row wrap" v-if="msg.DutyType==2">
+          <div class="col-6 q-pr-lg">
             <q-select stack-label color="primary" filled clearable label="选择事项类型" option-value="Id" option-label="Name"
               :options="itemTypeOptions" v-model="msg.ItemType" ref="ItemType" emit-value map-options
               :rules="[val => !!val || '请选择事项类型']" />
           </div>
         </div>
+        <div class="row wrap">
+          <div class="col-12">
+            <q-input filled type="textarea" :rows="2" stack-label :dense="false" v-model="msg.ItemName" ref="ItemName"
+              class="col-12 q-pb-lg" label="事项名称" :rules="[val => !!val || '请填写事项名称']" />
+          </div>
+        </div>
         <div class="row wrap addDutyUpload">
           <div class="col-12">
             <div style="display:flex;flex-wrap: wrap;">
@@ -131,8 +133,8 @@
           ItemType: 0,
           Shifts: "",
           ItemImgList: [],
-          DutyCategory: 0, //值班事项分类(1-工作清单，2-突发事项，3-交接说明)
-          DutyType: 0, //值班类型(1-规则事项，2-值班事项)
+          DutyCategory: '', //值班事项分类(1-工作清单，2-突发事项，3-交接说明)
+          DutyType: '', //值班类型(1-规则事项，2-值班事项)
         },
         BasicImg: "",
         dutyCategoryList: [{
@@ -141,7 +143,7 @@
           },
           {
             Id: 2,
-            Name: "工作清单"
+            Name: "突发事件"
           },
           {
             Id: 3,
@@ -157,6 +159,10 @@
             Name: "值班事项"
           },
         ],
+        dutyTypeList2:[{
+            Id: 1,
+            Name: "规则事项"
+        }],
         persistent: true,
         schoolOptions: [],
         frequencyOptions: [],
@@ -225,18 +231,28 @@
         this.msg.ItemType = "";
         this.msg.Shifts = "";
         this.msg.ItemImgList = [];
+        this.msg.DutyCategory = "";
+        this.msg.DutyType = "";
         this.BgImg = "";
       },
       //保存信息
       saveRule() {
         this.$refs.ItemName.validate();
-        this.$refs.ItemType.validate();
         this.$refs.Shifts.validate();
         this.$refs.ItemSchools.validate();
+        this.$refs.DutyCategory.validate();
+        this.$refs.DutyType.validate();
+        if(this.msg.DutyType==2){
+          this.$refs.ItemType.validate();
+          if(this.$refs.ItemType.hasError){
+            return
+          }
+        }
         if (!this.$refs.ItemName.hasError &&
-          !this.$refs.ItemType.hasError &&
           !this.$refs.Shifts.hasError &&
-          !this.$refs.ItemSchools.hasError) {
+          !this.$refs.ItemSchools.hasError &&
+          !this.$refs.DutyCategory.hasError &&
+          !this.$refs.DutyType.hasError) {
           this.msg.ItemSchools = this.schoolArr.toString();
           this.msg.Shifts = this.FrequencyArr.toString();
           saveDutyItem(this.msg).then(res => {