优化

ygtx-ui/src/views/gxt/gxtOrder/index.vue

@@ -524,11 +524,16 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-col :span="12">
+            <el-col :span="12" v-if="acceptForm.infoEntry == '1'">
               <el-form-item label="MIS工单编码">
                 <el-input v-model="acceptForm.misNo" disabled />
               </el-form-item>
             </el-col>
+            <el-col :span="12" v-if="acceptForm.infoEntry == '2'">
+              <el-form-item label="工作票编号">
+                <el-input v-model="acceptForm.workPermitNum" disabled />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
@@ -656,7 +661,7 @@
       <div class="space-y-4">
         <el-alert type="info" :closable="false" style="border-color: #14b8a6; background-color: #f0fdfa; color: #0d9488; height: 35px;">
           <template #default>
-            <i class="fa fa-file-text-o mr-2" style="color: #0d9488;"> 请上传相关附件完成结单。</i>
+            <i class="fa fa-file-text-o mr-2" style="color: #0d9488;"> 请选择信息录入方式，并上传相关附件完成结单。</i>
           </template>
         </el-alert>
         <el-form ref="finishRef" :model="finishForm" :rules="finishRules" label-width="120px" label-position="top">
@@ -927,11 +932,16 @@
             <el-col :span="12">
               <el-form-item label="开始时间"><el-input v-model="restartForm.realStartTime" disabled /> </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="restartForm.infoEntry == '1'">
               <el-form-item label="MIS工单编码">
                 <el-input v-model="restartForm.misNo" disabled />
               </el-form-item>
             </el-col>
+            <el-col :span="12" v-if="restartForm.infoEntry == '2'">
+              <el-form-item label="工作票编号">
+                <el-input v-model="restartForm.workPermitNum" disabled />
+              </el-form-item>
+            </el-col>
 <!--          </el-row>-->
           <!-- 处理信息 -->
 <!--          <h4 class="text-sm font-medium text-gray-800 mb-3">处理信息</h4>-->
@@ -1972,6 +1982,7 @@ const data = reactive({
     ],
     // 动态控制 content 是否必填
     content: [
+      { required: true, message: "维保内容不能为空", trigger: "blur" },
       {
         validator: (rule, value, callback) => {
           // 当 infoEntry == 2 时才校验必填

ygtx-ui/src/views/gxt/repairOrder/index.vue

@@ -897,7 +897,7 @@
     <el-dialog title="结单" v-model="finalizeDialogVisible" width="800px" append-to-body @close="closeFinalizeDialog">
       <el-alert type="info" :closable="false" style="border-color: #14b8a6; background-color: #f0fdfa; color: #0d9488; height: 35px;">
         <template #default>
-          <i class="fa fa-file-text-o mr-2" style="color: #0d9488;"> 请上传相关附件完成结单。</i>
+          <i class="fa fa-file-text-o mr-2" style="color: #0d9488;"> 请选择信息录入方式，并上传相关附件完成结单。</i>
         </template>
       </el-alert>
       <h4 class="text-sm font-medium text-gray-800 mb-3"></h4>
@@ -978,144 +978,143 @@
 <!--              </el-select>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
-
-          <!-- 正常维修时显示的字段 -->
-          <template v-if="!finalizeForm.repairMethod || finalizeForm.repairMethod === '1'">
-            <el-col :span="12">
-              <el-form-item label="工作部位" prop="workArea">
-                <el-select
-                    v-model="finalizeForm.workArea"
-                    multiple
-                    placeholder="请选择工作部位"
-                    style="width: 100%"
-                >
-                  <el-option
-                      v-for="dict in gxt_work_area"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="信息录入" prop="infoEntry">
-                <el-radio-group v-model="finalizeForm.infoEntry" @change="handleInfoEntryChange">
-                  <el-radio
-                    v-for="dict in gxt_info_entry"
-                    :key="dict.value"
-                    :label="dict.value"
-                  >
-                    {{ dict.label }}
-                  </el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="finalizeForm.infoEntry == 1">
-              <el-form-item label="MIS工单编码" prop="misOrderNo" >
-                <el-input
-                  v-model="finalizeForm.misOrderNo"
-                  placeholder="请输入MIS工单编码或点击搜索选择"
-                  clearable
-                  @focus="handleMisNoInputFocus"
-                  @blur="handleMisNoInputBlur"
-                  @input="handleMisNoInput"
-                  @clear="handleMisNoClear"
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="信息录入" prop="infoEntry">
+              <el-radio-group v-model="finalizeForm.infoEntry" @change="handleInfoEntryChange">
+                <el-radio
+                  v-for="dict in gxt_info_entry"
+                  :key="dict.value"
+                  :label="dict.value"
                 >
-                  <template #append>
-                    <el-button @click="handleSelectMisInfo" icon="Search"></el-button>
-                  </template>
-                </el-input>
-                <!-- 快速检索下拉框 -->
-                <div class="quick-select-dropdown" v-show="showMisNoQuickSelect && quickMisNoList.length > 0">
-                  <div
-                      v-for="item in quickMisNoList"
-                      :key="item.misNo"
-                      class="quick-select-item"
-                      @click="handleMisNoQuickSelect(item)">
-                    <span class="mis-no">{{ item.misNo }}</span>
-                  </div>
-                </div>
-                <div class="quick-select-dropdown no-data" v-show="showMisNoQuickSelect && quickMisNoList.length === 0 && form.misNo">
-                  <div>未找到匹配的MIS工单</div>
+                  {{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="finalizeForm.infoEntry == 1">
+            <el-form-item label="MIS工单编码" prop="misOrderNo" >
+              <el-input
+                v-model="finalizeForm.misOrderNo"
+                placeholder="请输入MIS工单编码或点击搜索选择"
+                clearable
+                @focus="handleMisNoInputFocus"
+                @blur="handleMisNoInputBlur"
+                @input="handleMisNoInput"
+                @clear="handleMisNoClear"
+              >
+                <template #append>
+                  <el-button @click="handleSelectMisInfo" icon="Search"></el-button>
+                </template>
+              </el-input>
+              <!-- 快速检索下拉框 -->
+              <div class="quick-select-dropdown" v-show="showMisNoQuickSelect && quickMisNoList.length > 0">
+                <div
+                    v-for="item in quickMisNoList"
+                    :key="item.misNo"
+                    class="quick-select-item"
+                    @click="handleMisNoQuickSelect(item)">
+                  <span class="mis-no">{{ item.misNo }}</span>
                 </div>
-              </el-form-item>
-            </el-col>
-            <!-- MIS选择组件 -->
-            <MisInfoSelectSingle :key="commonKey" v-model="misInfoSelectVisible" @onSelected="onMisInfoSelected" :pcsStationName="finalizeForm.pcsStationName" :pcsDeviceName="finalizeForm.pcsDeviceName"></MisInfoSelectSingle>
-            <el-col :span="12" v-if="finalizeForm.infoEntry == 2">
-              <el-form-item label="工作票编号" prop="workPermitNum">
-                <el-input v-model="workPermitNumProxy"   maxlength="20" show-word-limit  />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="开始时间" prop="realStartTime">
-                <el-date-picker
-                    v-model="finalizeForm.realStartTime"
-                    type="datetime"
-                    format="YYYY-MM-DD HH:mm"
-                    value-format="YYYY-MM-DD HH:mm"
-                    placeholder="请选择开始时间"
-                    style="width: 100%"
-                    :readonly="finalizeForm.infoEntry == 1"
-                    :disabled-date="disabledStartDate"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="结束时间" prop="realEndTime">
-                <el-date-picker
-                    v-model="finalizeForm.realEndTime"
-                    type="datetime"
-                    format="YYYY-MM-DD HH:mm"
-                    value-format="YYYY-MM-DD HH:mm"
-                    placeholder="请选择结束时间"
-                    style="width: 100%"
-                    :readonly="finalizeForm.infoEntry == 1"
-                    :disabled-date="disabledEndDate"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="检修人员" prop="workGroupMemberName">
-                <el-input
-                    v-model="finalizeForm.workGroupMemberName"
-                    placeholder="请输入检修人员"
-                    maxlength="200"
-                    show-word-limit
-                    :readonly="finalizeForm.infoEntry == 1"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="外委人员数（人）" prop="wwryNum">
-                <el-input-number
-                    v-model="finalizeForm.wwryNum"
-                    placeholder="请输入外委人员数"
-                    controls-position="right"
-                    style="width: 100%"
-                    class="input-number-left"
-                    :min="0"
-                    :step="1"
-                    :precision="0"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="外来人员数（人）" prop="wlryNum">
-                <el-input-number
-                    v-model="finalizeForm.wlryNum"
-                    placeholder="请输入外来人员数"
-                    controls-position="right"
-                    style="width: 100%"
-                    class="input-number-left"
-                    :min="0"
-                    :step="1"
-                    :precision="0"
+              </div>
+              <div class="quick-select-dropdown no-data" v-show="showMisNoQuickSelect && quickMisNoList.length === 0 && form.misNo">
+                <div>未找到匹配的MIS工单</div>
+              </div>
+            </el-form-item>
+          </el-col>
+          <!-- MIS选择组件 -->
+          <MisInfoSelectSingle :key="commonKey" v-model="misInfoSelectVisible" @onSelected="onMisInfoSelected" :pcsStationName="finalizeForm.pcsStationName" :pcsDeviceName="finalizeForm.pcsDeviceName"></MisInfoSelectSingle>
+          <el-col :span="12" v-if="finalizeForm.infoEntry == 2">
+            <el-form-item label="工作票编号" prop="workPermitNum">
+              <el-input v-model="workPermitNumProxy"   maxlength="20" show-word-limit  />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开始时间" prop="realStartTime">
+              <el-date-picker
+                  v-model="finalizeForm.realStartTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm"
+                  placeholder="请选择开始时间"
+                  style="width: 100%"
+                  :readonly="finalizeForm.infoEntry == 1"
+                  :disabled-date="disabledStartDate"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工作部位" prop="workArea">
+              <el-select
+                  v-model="finalizeForm.workArea"
+                  multiple
+                  placeholder="请选择工作部位"
+                  style="width: 100%"
+              >
+                <el-option
+                    v-for="dict in gxt_work_area"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
                 />
-              </el-form-item>
-            </el-col>
-          </template>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="结束时间" prop="realEndTime">
+              <el-date-picker
+                  v-model="finalizeForm.realEndTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm"
+                  placeholder="请选择结束时间"
+                  style="width: 100%"
+                  :readonly="finalizeForm.infoEntry == 1"
+                  :disabled-date="disabledEndDate"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检修人员" prop="workGroupMemberName">
+              <el-input
+                  v-model="finalizeForm.workGroupMemberName"
+                  placeholder="请输入检修人员"
+                  maxlength="200"
+                  show-word-limit
+                  :readonly="finalizeForm.infoEntry == 1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="外委人员数（人）" prop="wwryNum">
+              <el-input-number
+                  v-model="finalizeForm.wwryNum"
+                  placeholder="请输入外委人员数"
+                  controls-position="right"
+                  style="width: 100%"
+                  class="input-number-left"
+                  :min="0"
+                  :step="1"
+                  :precision="0"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="外来人员数（人）" prop="wlryNum">
+              <el-input-number
+                  v-model="finalizeForm.wlryNum"
+                  placeholder="请输入外来人员数"
+                  controls-position="right"
+                  style="width: 100%"
+                  class="input-number-left"
+                  :min="0"
+                  :step="1"
+                  :precision="0"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="真实故障原因" prop="realContent">
               <el-input v-model="finalizeForm.realFailureReason"
@@ -1408,9 +1407,14 @@
           <el-col :span="12">
             <el-form-item label="发生时间"><el-input v-model="restartForm.occurTime" disabled /> </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="restartForm.infoEntry == '1'">
             <el-form-item label="MIS工单编码"><el-input v-model="restartForm.misOrderNo" disabled /> </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="restartForm.infoEntry == '2'">
+            <el-form-item label="工作票编号">
+              <el-input v-model="restartForm.workPermitNum" disabled />
+            </el-form-item>
+          </el-col>
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="检修类型">-->
 <!--              <el-select v-model="restartForm.maintenanceType" style="width: 100%" disabled>-->