刘洋 1 년 전
부모
커밋
13679c3095
2개의 변경된 파일17개의 추가작업 그리고 6개의 파일을 삭제
  1. 5 1
      src/views/sop/sop-manage/device-out-in/index.vue
  2. 12 5
      src/views/sop/sop-manage/plan-change/index.vue

+ 5 - 1
src/views/sop/sop-manage/device-out-in/index.vue

@@ -59,7 +59,11 @@
           {{ timestampFilter(row[col.colKey]) }}
         </template>
         <template #status="{ col, row }">
-          {{ runningStatusFilter(row[col.colKey]) }}
+          <!-- {{ runningStatusFilter(row[col.colKey]) }} -->
+          <status-tag
+            :value="row[col.colKey]"
+            type="runningStatus"
+          ></status-tag>
         </template>
         <template #usageType="{ col, row }">
           {{ deviceUsageTypeFilter(row[col.colKey]) }}

+ 12 - 5
src/views/sop/sop-manage/plan-change/index.vue

@@ -155,11 +155,18 @@
               </t-form-item>
             </t-col>
             <t-col :span="12">
-              <t-form-item label="变更备注" name="remark">
-                <t-textarea
-                  v-model="formData.remark"
-                  :disabled="IS_VIEW_MODE"
-                ></t-textarea>
+              <t-form-item label="" name="remark">
+                <div style="width: 100%">
+                  <p style="font-size: 14px; color: #595959; margin-bottom: 6px"
+                    >变更备注:<span class="red"
+                      >(取消变更、部分变更,此项必填)</span
+                    ></p
+                  >
+                  <t-textarea
+                    v-model="formData.remark"
+                    :disabled="IS_VIEW_MODE"
+                  ></t-textarea>
+                </div>
               </t-form-item>
             </t-col>
           </template>