change

src/router/index.js

@@ -125,12 +125,12 @@ export const constantRoutes = [
         name: '用户处方',
         meta: { title: '用户处方', icon: 'job', noCache: true, affix: false }
       },
-      // {
-      //   path: 'refuse',
-      //   component: (resolve) => require(['@/views/his/refuse/index'], resolve),
-      //   name: '拒方列表',
-      //   meta: { title: '拒方列表', icon: 'job', noCache: true, affix: false }
-      // },
+      {
+        path: 'refuse',
+        component: (resolve) => require(['@/views/his/refuse/index'], resolve),
+        name: '拒方列表',
+        meta: { title: '拒方列表', icon: 'job', noCache: true, affix: false }
+      },
     ]
   },
 

src/views/collection/index.vue

@@ -222,4 +222,19 @@ export default {
     }
 
 };
-</script>
+</script>
+
+<style scoped>
+:deep(.el-checkbox__input.is-disabled + .el-checkbox__label) {
+  color: #808080 !important;
+}
+
+.el-checkbox__input.is-disabled.is-checked + .el-checkbox__label {
+  color: #1890ff !important;
+}
+
+:deep(.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner) {
+  background-color: #1890ff !important;
+  border-color: #1890ff !important;
+}
+</style>

src/views/doctor/prescribeAudit/index.vue

@@ -6,9 +6,9 @@
       </el-form-item>
       <el-form-item label="审核状态" prop="auditStatus">
         <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态" clearable>
-          <el-option label="待审核" :value="1" />
-          <el-option label="审核通过" :value="2" />
-          <el-option label="审核不通过" :value="3" />
+          <el-option label="待审核" :value="0" />
+          <el-option label="审核通过" :value="1" />
+          <el-option label="审核不通过" :value="2" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="dateRange">
@@ -25,8 +25,8 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="success" icon="el-icon-check" size="mini" @click="quickFilter(2)">已审核</el-button>
-        <el-button type="warning" icon="el-icon-time" size="mini" @click="quickFilter(1)">待审核</el-button>
+        <!-- <el-button type="success" icon="el-icon-check" size="mini" @click="quickFilter(1)">已审核</el-button> -->
+        <el-button type="warning" icon="el-icon-time" size="mini" @click="quickFilter(0)">待审核</el-button>
       </el-form-item>
     </el-form>
 
@@ -69,11 +69,11 @@
       <el-form :model="auditForm" ref="auditFormRef" label-width="90px">
         <el-form-item label="审核状态" prop="auditStatus">
           <el-radio-group v-model="auditForm.auditStatus">
-            <el-radio :label="2">审核通过</el-radio>
-            <el-radio :label="3">审核不通过</el-radio>
+            <el-radio :label="1">审核通过</el-radio>
+            <el-radio :label="2">审核不通过</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="auditForm.auditStatus === 3" label="拒绝原因" prop="auditReason">
+        <el-form-item v-if="auditForm.auditStatus === 2" label="拒绝原因" prop="auditReason">
           <el-input type="textarea" v-model="auditForm.auditReason" placeholder="请填写拒绝原因" :rows="3" />
         </el-form-item>
       </el-form>
@@ -122,12 +122,13 @@ export default {
         patientName: undefined,
         auditStatus: undefined,
         beginCreateTime: undefined,
-        endCreateTime: undefined
+        endCreateTime: undefined,
+        type: 2
       },
       auditDialog: { open: false },
       auditForm: {
         prescribeId: undefined,
-        auditStatus: 2,
+        auditStatus: 1,
         auditReason: ''
       },
       drugsDialog: { open: false },
@@ -145,9 +146,9 @@ export default {
       return '-'
     },
     statusFormat(val) {
-      if (val === 1 || val === '1') return '待审核'
-      if (val === 2 || val === '2') return '审核通过'
-      if (val === 3 || val === '3') return '审核不通过'
+      if (val === 0 || val === '0') return '待审核'
+      if (val === 1 || val === '1') return '审核通过'
+      if (val === 2 || val === '2') return '审核不通过'
       return '-'
     },
     handleQuery() {
@@ -193,21 +194,21 @@ export default {
     },
     isPending(row) {
       const current = (row.auditStatus != null ? row.auditStatus : row.status)
-      return current === 1 || current === '1'
+      return current === 0 || current === '0'
     },
     handleAudit(row) {
       const current = (row.auditStatus != null ? row.auditStatus : row.status)
-      if (!(current === 1 || current === '1')) {
+      if (!(current === 0 || current === '0')) {
         this.$message.warning('仅待审核记录可操作')
         return
       }
       this.auditForm.prescribeId = row.prescribeId
-      this.auditForm.auditStatus = (current === 2 || current === '2') ? 2 : (current === 3 || current === '3') ? 3 : 2
+      this.auditForm.auditStatus = (current === 1 || current === '1') ? 1 : (current === 2 || current === '2') ? 2 : 1
       this.auditForm.auditReason = row.auditReason || ''
       this.auditDialog.open = true
     },
     submitAudit() {
-      if (this.auditForm.auditStatus === 3 && (!this.auditForm.auditReason || !this.auditForm.auditReason.trim())) {
+      if (this.auditForm.auditStatus === 2 && (!this.auditForm.auditReason || !this.auditForm.auditReason.trim())) {
         this.$message.error('请填写拒绝原因')
         return
       }

src/views/his/prescribe/index.vue

@@ -315,24 +315,7 @@
         <el-form-item label="每次用药数量" prop="usagePerUseCount">
           <el-input v-model="drugForm.usagePerUseCount" placeholder="请输入每次用药数量" />
         </el-form-item>
-        <el-form-item label="每次用药单位" prop="usagePerUseUnit">
-          <el-input v-model="drugForm.usagePerUseUnit" placeholder="请输入每次用药单位,如:片、粒、ml" />
-        </el-form-item>
-        <el-form-item label="天数" prop="usageDays">
-          <el-input v-model="drugForm.usageDays" placeholder="请输入天数" />
-        </el-form-item>
-        <el-form-item label="药品单价" prop="drugPrice">
-          <el-input v-model="drugForm.drugPrice" placeholder="请输入药品单价" type="number" />
-        </el-form-item>
-        <el-form-item label="药品数量" prop="drugNum">
-          <el-input v-model="drugForm.drugNum" placeholder="请输入药品数量" type="number" />
-        </el-form-item>
-        <el-form-item label="药品数量单位" prop="drugUnit">
-          <el-input v-model="drugForm.drugUnit" placeholder="请输入药品数量单位,如:盒、瓶" />
-        </el-form-item>
-        <el-form-item label="药品说明书" prop="instructions">
-          <el-input v-model="drugForm.instructions" type="textarea" :rows="3" placeholder="请输入药品说明书" />
-        </el-form-item>
+       
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="drugOpen = false">取 消</el-button>

src/views/his/refuse/index.vue

@@ -10,9 +10,9 @@
       <el-form-item label="处方单号" prop="prescribeCode">
         <el-input v-model="queryParams.prescribeCode" placeholder="请输入处方单号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="订单编号" prop="orderCode">
+      <!-- <el-form-item label="订单编号" prop="orderCode">
         <el-input v-model="queryParams.orderCode" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="患者姓名" prop="patientName">
         <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -121,23 +121,13 @@
           <dict-tag :options="prescribeTypeOptions" :value="scope.row.prescribeType"/>
         </template>
       </el-table-column>
-      <el-table-column label="订单编号" align="center" prop="orderCode" width="180" />
       <el-table-column label="患者姓名" align="center" prop="patientName" />
-<!--      <el-table-column label="患者电话" align="center" prop="patientTel" />-->
       <el-table-column label="医生姓名" align="center" prop="doctorName" />
-      <el-table-column label="是否确认" align="center" prop="doctorConfirm" >
-        <template slot-scope="scope">
-          <dict-tag :options="doctorConfirmOptions" :value="scope.row.doctorConfirm"/>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="状态" align="center" prop="status">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="statusOptions" :value="scope.row.status"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="审核医师" align="center" prop="doctorDrugName" />
+      <el-table-column label="拒方原因" :show-overflow-tooltip="true" align="center" prop="auditReason" />
       <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -150,7 +140,6 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >开方</el-button>
         </template>
@@ -307,7 +296,7 @@
         <el-form-item label="每次用药数量" prop="usagePerUseCount">
           <el-input v-model="drugForm.usagePerUseCount" placeholder="请输入每次用药数量" />
         </el-form-item>
-        <el-form-item label="每次用药单位" prop="usagePerUseUnit">
+        <!-- <el-form-item label="每次用药单位" prop="usagePerUseUnit">
           <el-input v-model="drugForm.usagePerUseUnit" placeholder="请输入每次用药单位,如:片、粒、ml" />
         </el-form-item>
         <el-form-item label="天数" prop="usageDays">
@@ -324,7 +313,7 @@
         </el-form-item>
         <el-form-item label="药品说明书" prop="instructions">
           <el-input v-model="drugForm.instructions" type="textarea" :rows="3" placeholder="请输入药品说明书" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="drugOpen = false">取 消</el-button>
@@ -383,10 +372,11 @@ export default {
         patientTel: undefined,
         status: undefined,
         doctorName: undefined,
-        beginCreateTime: undefined,
-        endCreateTime: undefined,
-        beginAuditTime: undefined,
-        endAuditTime: undefined
+        sTime: undefined,
+        eTime: undefined,
+        auditETime: undefined,
+        auditSTime: undefined,
+        status: 2,//拒绝
       },
       currentConfirm: null,
       form: {},
@@ -471,22 +461,22 @@ export default {
       let obj = { ...params };
       if (dateRange != null && dateRange.length > 0) {
         if (type === 'Create') {
-          obj.beginCreateTime = dateRange[0];
-          obj.endCreateTime = dateRange[1];
+          obj.sTime = dateRange[0];
+          obj.eTime = dateRange[1];
         } else if (type === 'Audit') {
-          obj.beginAuditTime = dateRange[0];
-          obj.endAuditTime = dateRange[1];
+          obj.auditSTime = dateRange[0];
+          obj.auditETime = dateRange[1];
         }
       }
       return obj;
     },
     handleDateRangeChange(val) {
-      this.queryParams.beginCreateTime = val ? val[0] : undefined;
-      this.queryParams.endCreateTime = val ? val[1] : undefined;
+      this.queryParams.sTime = val ? val[0] : undefined;
+      this.queryParams.eTime = val ? val[1] : undefined;
     },
     handleAuditDateRangeChange(val) {
-      this.queryParams.beginAuditTime = val ? val[0] : undefined;
-      this.queryParams.endAuditTime = val ? val[1] : undefined;
+      this.queryParams.auditSTime = val ? val[0] : undefined;
+      this.queryParams.auditETime = val ? val[1] : undefined;
     },
     /** 重置按钮操作 */
     resetQuery() {