🦄 refactor(日报): 调整

src/views/pms/iotrhdailyreport/approval.vue

@@ -804,26 +804,28 @@ const submitForm = async (auditStatus: 20 | 30) => {
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="生产动态" prop="productionStatus">
-          <el-input
-            v-model="form.productionStatus"
-            placeholder="请输入生产动态"
-            type="textarea"
-            autosize
-            :max-length="1000"
-            disabled
-          />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="form.remark"
-            placeholder="请输入备注"
-            :max-length="1000"
-            type="textarea"
-            autosize
-            disabled
-          />
-        </el-form-item>
+        <div class="grid grid-cols-1 gap-4 mt-5">
+          <el-form-item label="生产动态" prop="productionStatus">
+            <el-input
+              v-model="form.productionStatus"
+              placeholder="请输入生产动态"
+              type="textarea"
+              autosize
+              :max-length="1000"
+              disabled
+            />
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              placeholder="请输入备注"
+              :max-length="1000"
+              type="textarea"
+              autosize
+              disabled
+            />
+          </el-form-item>
+        </div>
       </div>
       <el-form-item class="mt-4" label="审批意见" prop="opinion">
         <el-input

src/views/pms/iotrhdailyreport/fill.vue

@@ -805,6 +805,8 @@ const submitForm = async () => {
             />
           </el-select>
         </el-form-item>
+      </div>
+      <div class="grid grid-cols-1 gap-4 mt-5">
         <el-form-item label="生产动态" prop="productionStatus">
           <el-input
             v-model="form.productionStatus"

src/views/pms/iotrhdailyreport/index.vue

@@ -145,7 +145,12 @@
             show-overflow-tooltip
             border
           >
-            <el-table-column :label="t('iotDevice.serial')" width="56px" align="center">
+            <el-table-column
+              :label="t('iotDevice.serial')"
+              width="56px"
+              align="center"
+              fixed="left"
+            >
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>

src/views/pms/iotrydailyreport/approval.vue

@@ -970,7 +970,8 @@ const submitForm = async (auditStatus: 20 | 30) => {
           />
         </el-form-item> -->
       </div>
-      <div class="grid grid-cols-4 gap-4 mt-5">
+      <el-divider content-position="left">生产时间</el-divider>
+      <div class="grid grid-cols-2 gap-4 mt-5">
         <el-form-item label="进尺工作时间(H)" prop="drillingWorkingTime">
           <el-input-number
             class="w-full!"
@@ -989,6 +990,9 @@ const submitForm = async (auditStatus: 20 | 30) => {
             disabled
           />
         </el-form-item>
+      </div>
+      <el-divider content-position="left">非生产时间</el-divider>
+      <div class="grid grid-cols-4 gap-4 mt-5">
         <el-form-item label="事故(H)" prop="accidentTime">
           <el-input-number
             class="w-full!"
@@ -1062,7 +1066,7 @@ const submitForm = async (auditStatus: 20 | 30) => {
           />
         </el-form-item>
       </div>
-      <div class="grid grid-cols-2 gap-4 mt-5">
+      <div class="grid grid-cols-1 gap-4 mt-5">
         <el-form-item label="生产动态" prop="productionStatus">
           <el-input
             v-model="form.productionStatus"

src/views/pms/iotrydailyreport/fill.vue

@@ -1010,7 +1010,8 @@ const submitForm = async () => {
           />
         </el-form-item>
       </div>
-      <div class="grid grid-cols-4 gap-4 mt-5">
+      <el-divider content-position="left">生产时间</el-divider>
+      <div class="grid grid-cols-2 gap-4 mt-5">
         <el-form-item label="进尺工作时间(H)" prop="drillingWorkingTime">
           <el-input-number
             class="w-full!"
@@ -1027,6 +1028,9 @@ const submitForm = async () => {
             placeholder="其它生产时间(H)"
           />
         </el-form-item>
+      </div>
+      <el-divider content-position="left">非生产时间</el-divider>
+      <div class="grid grid-cols-4 gap-4 mt-5">
         <el-form-item label="事故(H)" prop="accidentTime">
           <el-input-number
             class="w-full!"
@@ -1092,7 +1096,7 @@ const submitForm = async () => {
           />
         </el-form-item>
       </div>
-      <div class="grid grid-cols-2 gap-4 mt-5">
+      <div class="grid grid-cols-1 gap-4 mt-5">
         <el-form-item label="生产动态" prop="productionStatus">
           <el-input
             v-model="form.productionStatus"

src/views/pms/iotrydailyreport/index.vue

@@ -110,7 +110,12 @@
             show-overflow-tooltip
             border
           >
-            <el-table-column :label="t('iotDevice.serial')" width="56px" align="center">
+            <el-table-column
+              :label="t('iotDevice.serial')"
+              width="56px"
+              align="center"
+              fixed="left"
+            >
               <template #default="scope">
                 {{ scope.$index + 1 }}
               </template>

src/views/pms/iotrydailyreport/xapproval.vue

@@ -891,26 +891,28 @@ const submitForm = async (auditStatus: 20 | 30) => {
             disabled
           />
         </el-form-item>
-        <el-form-item label="生产动态" prop="productionStatus">
-          <el-input
-            v-model="form.productionStatus"
-            placeholder="请输入生产动态"
-            type="textarea"
-            autosize
-            :max-length="1000"
-            disabled
-          />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="form.remark"
-            placeholder="请输入备注"
-            :max-length="1000"
-            type="textarea"
-            autosize
-            disabled
-          />
-        </el-form-item>
+        <div class="grid grid-cols-1 gap-4 mt-5"
+          ><el-form-item label="生产动态" prop="productionStatus">
+            <el-input
+              v-model="form.productionStatus"
+              placeholder="请输入生产动态"
+              type="textarea"
+              autosize
+              :max-length="1000"
+              disabled
+            />
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              placeholder="请输入备注"
+              :max-length="1000"
+              type="textarea"
+              autosize
+              disabled
+            />
+          </el-form-item>
+        </div>
       </div>
       <el-form-item class="mt-4" label="审批意见" prop="opinion">
         <el-input

src/views/pms/iotrydailyreport/xfill.vue

@@ -890,24 +890,25 @@ const submitForm = async () => {
         <el-form-item label="休假人员数量" prop="leaveStaffNum">
           <el-input-number :min="0" v-model="form.leaveStaffNum" placeholder="请输入休假人员数量" />
         </el-form-item>
-        <el-form-item label="生产动态" prop="productionStatus">
-          <el-input
-            v-model="form.productionStatus"
-            placeholder="请输入生产动态"
-            type="textarea"
-            autosize
-            :max-length="1000"
-          />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="form.remark"
-            placeholder="请输入备注"
-            :max-length="1000"
-            type="textarea"
-            autosize
-          />
-        </el-form-item>
+        <div class="grid grid-cols-1 gap-4 mt-5">
+          <el-form-item label="生产动态" prop="productionStatus">
+            <el-input
+              v-model="form.productionStatus"
+              placeholder="请输入生产动态"
+              type="textarea"
+              autosize
+              :max-length="1000"
+            />
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              placeholder="请输入备注"
+              :max-length="1000"
+              type="textarea"
+              autosize
+            /> </el-form-item
+        ></div>
       </div>
     </el-form>
     <template #footer>