页面修改

src/components/duty/dutyItemManagement.vue

@@ -3,8 +3,8 @@
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
-          <q-input @input="resetSearch" clearable standout="bg-primary text-white"
-            v-model="qMsg.ItemName" label="事项名称" maxlength="20" @clear="resetSearch" />
+          <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="qMsg.ItemName" label="事项名称"
+            maxlength="20" @clear="resetSearch" />
         </div>
         <div class="col-3">
           <q-select @input="resetSearch" clearable multiple standout="bg-primary text-white" option-value="SId"
@@ -12,8 +12,9 @@
             @clear="resetSearch" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" clearable stack-label v-model="qMsg.DutyCategory" :options="dutyCategoryList" color="primary" filled
-            label="分类" option-label="Name" option-value="Id" ref="DutyCategory" emit-value map-options @clear="resetSearch" />
+          <q-select @input="resetSearch" clearable stack-label v-model="qMsg.DutyCategory" :options="dutyCategoryList"
+            color="primary" filled label="分类" option-label="Name" option-value="Id" ref="DutyCategory" emit-value
+            map-options @clear="resetSearch" />
         </div>
       </div>
     </div>
@@ -43,7 +44,9 @@
               <div>{{props.row.DutyTypeStr}}</div>
             </q-td>
             <q-td key="ItemType" :props="props">
-              {{props.row.ItemType==1?'选择':'手动填写'}}
+              <template v-if="props.row.DutyType==2">
+                {{props.row.ItemType==1?'选择':'手动填写'}}
+              </template>
             </q-td>
             <q-td key="ShiftsName" :props="props">
               {{props.row.ShiftsName}}
@@ -104,7 +107,7 @@
           },
           {
             name: 'ItemType',
-            label: '事项类型',
+            label: '填写方式',
             field: 'ItemType',
             align: 'left',
           },
@@ -133,7 +136,7 @@
           rowsPerPage: 10,
           ItemName: "", //事项名称
           ItemSchools: [], //所属校区
-          DutyCategory:''
+          DutyCategory: ''
         },
         pageCount: 0,
         isShowAdd: false, //是否显示添加事项弹窗

src/components/schedul/schedul-orderlist.vue

@@ -532,7 +532,8 @@
   import {
     SetDutyContent,
     RemoveDutyContent,
-    queryDutyWork
+    queryDutyWork,
+    queryDutyWork_V2
   } from '../../api/scheduling/schedu'
   import {
     UploadSelfFile

src/pages/scheduling/scheduleBoard.vue

@@ -279,6 +279,7 @@
 <script>
   import {
     OnDuty,
+    OnDuty_V2,
     saveDutyCheck, //值班打卡
   } from '../../api/scheduling/schedu'
 

src/pages/scheduling/scheduleInfo.vue

@@ -254,6 +254,7 @@
 <script>
   import {
     OnDuty,
+    OnDuty_V2,
     saveDutyCheck, //值班打卡
   } from '../../api/scheduling/schedu'