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

src/views/business/attendance/dakaDialog.vue

@@ -19,7 +19,8 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="handleCancel">取消</el-button>
-      <el-button type="primary" @click="handleConfirm">确定</el-button>
+      <el-button type="primary" @click="handleConfirm('1')">上班</el-button>
+      <el-button type="primary" @click="handleConfirm('2')">下班</el-button>
     </span>
   </el-dialog>
 </template>
@@ -59,12 +60,12 @@ export default {
     }
   },
   methods: {
-    handleConfirm() {
+    handleConfirm(clockType) {
       if (!this.selectedValue) {
         this.$message.warning('请选择一个班次')
         return
       }
-      this.$emit('confirm', this.selectedValue)
+      this.$emit('confirm', this.selectedValue,clockType)
       this.dialogVisible = false
     },
     handleClose() {

src/views/component/qualityControl/qualityControlChildTabTwo.vue

@@ -113,14 +113,22 @@
                         align="center"
                       >
                         <template slot-scope="{ row }">
-                          <el-input
+                          <el-select
                             v-if="!disabled"
                             v-model="row[item.val[i]]"
-                            :min="0"
-                            size="mini"
-                            placeholder="请输入"
-                            type="text"
-                          />
+                            filterable
+                            allow-create
+                            clearable
+                            placeholder="请选择"
+                          >
+                            <el-option
+                              v-for="s in optionsS"
+                              :key="s.value"
+                              :label="s.label"
+                              :value="s.value"
+                            >
+                            </el-option>
+                          </el-select>
                           <span v-else>{{ row[item.val[i]] || '/' }}</span>
                         </template>
                       </el-table-column>

src/views/system/homepage/index.vue

@@ -827,7 +827,8 @@ export default {
       this.scheduleConfig = data
       this.$refs.schedule.openDialog()
     },
-    dakaSingle(selectedValue) {
+    dakaSingle(selectedValue,clockType) {
+      
       const selectedpaiban = this.ScheduleConfigItem.find(item => item.paiBanLeiXing === selectedValue)
       const { userId,userInfo } = this.$store.getters || {}
       const buMen = userInfo.mainPosition?.id || userInfo.positions[0]?.id || ''
@@ -835,7 +836,8 @@ export default {
           "yongHuId": userId,
           "paiBanMingChen": selectedpaiban.peiZhiMingChen,
           "banCiMing": selectedpaiban.paiBanLeiXing,
-          "buMen": buMen
+          "buMen": buMen,
+          "clockType":clockType
       }
       gdClockIn(params)
           .then((res) => {
@@ -874,8 +876,9 @@ export default {
         })
         
     },*/
-    handleDakaConfirm(selectedValue) {
-      this.dakaSingle(selectedValue)
+    handleDakaConfirm(selectedValue,clockType) {
+      
+      this.dakaSingle(selectedValue,clockType)
     },
     handleDakaDialog(data) {
       const types = data.map(item => item.paiBanLeiXing)   // 班次类型