Merge branch '港大医院' of http://119.23.210.103:3000/ZhuJiaHao/zdqy_firm_former into 港大医院

src/views/business/attendance/attendanceDetails.vue

@@ -98,14 +98,14 @@
             width="100"
           />-->
         </el-table-column>
-        <el-table-column key="riQi" prop="riQi" label="日期" width="100" />
+        <el-table-column key="riQi" prop="riQi" label="日期" width="90" />
         <!-- 上班分组 -->
         <el-table-column label="上班">
           <el-table-column
             key="daKaShiJian1"
             prop="daKaShiJian1"
             label="打卡时间"
-            width="160"
+            width="150"
             :formatter="formatDateTime"
           />
           <el-table-column
@@ -142,7 +142,7 @@
             key="daKaShiJian2"
             prop="daKaShiJian2"
             label="打卡时间"
-            width="160"
+            width="150"
             :formatter="formatDateTime"
           />
           <el-table-column
@@ -201,12 +201,17 @@
             </span>
           </template>
         </el-table-column>
-
+        <el-table-column
+          key="beiZhu"
+          prop="beiZhu"
+          label="备注"
+          width="85"
+        />
         <!-- 操作列：仅质量负责人可见 -->
         <el-table-column
           v-if="isQualityManager"
           label="操作"
-          width="90"
+          width="75"
           fixed="right"
         >
           <template #default="{ row }">
@@ -244,6 +249,14 @@
             style="width: 100%"
           />
         </el-form-item>
+        <el-form-item label="备注">
+          <el-input
+            type="textarea"
+            v-model="editForm.beiZhu"
+            :rows="3"
+            placeholder="请输入备注信息"
+          />
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="editDialogVisible = false">取消</el-button>
@@ -381,7 +394,8 @@ export default {
       editForm: {
         id: '',
         daKaShiJian1: '',
-        daKaShiJian2: ''
+        daKaShiJian2: '',
+        beiZhu: ''
       },
       saveLoading: false
     }
@@ -571,14 +585,15 @@ export default {
       this.editForm = {
         id: row.id,
         daKaShiJian1: row.daKaShiJian1 || '',
-        daKaShiJian2: row.daKaShiJian2 || ''
+        daKaShiJian2: row.daKaShiJian2 || '',
+        beiZhu: row.beiZhu || ''
       }
       this.editDialogVisible = true
     },
     closeEditDialog() {
       this.editDialogVisible = false
       this.currentEditRow = null
-      this.editForm = { id:'',daKaShiJian1: '', daKaShiJian2: '' }
+      this.editForm = { id:'',daKaShiJian1: '', daKaShiJian2: '',beiZhu: '' }
     },
     saveEditTime() {
       if (!this.currentEditRow) return
@@ -587,7 +602,8 @@ export default {
       const postData = {
         id: this.editForm.id,        // 主键字段名 id_
         daKaShiJian1: this.editForm.daKaShiJian1,
-        daKaShiJian2: this.editForm.daKaShiJian2
+        daKaShiJian2: this.editForm.daKaShiJian2,
+        beiZhu: this.editForm.beiZhu
       }
       gdUpdateAttendce(postData)
         .then(() => {

src/views/component/qualityControl/qualityControlChildTabTwo.vue

@@ -20,7 +20,7 @@
               v-if="field.name === 'component_1qyrt3i'"
               label="凝聚胺法"
               prop="fangFa"
-              width="130"
+              width="150"
               align="center"
             />
             <el-table-column
@@ -28,7 +28,7 @@
                 field.name === 'component_1qyrt3i' ? '供者编号' : '质控编号'
               "
               prop="bianHao"
-              width="130"
+              :width="field.name === 'component_1qyrt3i' ? 150 : 100"
               align="center"
             />
             <el-table-column
@@ -42,7 +42,7 @@
                 :prop="item.val[i]"
                 :label="it"
                 :key="'child1' + i"
-                width="120"
+                :width="field.name === 'component_1qyrt3i' ? 113.2143 : 85"
                 align="center"
               >
                 <template slot-scope="{ row }">
@@ -77,7 +77,7 @@
             <div
               slot="append"
               :style="{
-                width: field.name === 'component_1qyrt3i' ? '1940px' : '2650px'
+                width: '1885px'
               }"
             >
               <el-row
@@ -95,7 +95,7 @@
                     <el-table-column
                       label="质控编号"
                       prop="bianHao"
-                      width="130"
+                      width="100"
                       align="center"
                     />
                     <el-table-column
@@ -109,7 +109,7 @@
                         :prop="item.val[i]"
                         :label="it"
                         :key="'child2' + i"
-                        width="120"
+                        width="85"
                         align="center"
                       >
                         <template slot-scope="{ row }">
@@ -142,7 +142,7 @@
                   class="labelSty"
                   :style="{
                     width:
-                      field.name === 'component_1qyrt3i' ? '260px' : '130px'
+                      field.name === 'component_1qyrt3i' ? '300px' : '100px'
                   }"
                   >结果符合预期：</div
                 >
@@ -151,7 +151,9 @@
                   class="chooseSty"
                   :style="{
                     width:
-                      field.name === 'component_1qyrt3i' ? '220px' : '340px'
+                      field.name === 'component_1qyrt3i'
+                        ? '206.4286px'
+                        : '235px'
                   }"
                 >
                   <el-radio-group
@@ -181,7 +183,7 @@
                   class="labelSty"
                   :style="{
                     width:
-                      field.name === 'component_1qyrt3i' ? '260px' : '130px'
+                      field.name === 'component_1qyrt3i' ? '300px' : '100px'
                   }"
                   >操作人：</div
                 >
@@ -190,7 +192,9 @@
                   class="chooseSty"
                   :style="{
                     width:
-                      field.name === 'component_1qyrt3i' ? '220px' : '340px'
+                      field.name === 'component_1qyrt3i'
+                        ? '206.4286px'
+                        : '235px'
                   }"
                 >
                   <ibps-user-selector
@@ -535,7 +539,7 @@ export default {
         padding: 0 10px;
       }
       .el-table__body-wrapper.is-scrolling-none {
-        width: 2650px;
+        width: 1885px;
       }
     }
   }