Merge branch 'feature/decoct.recipe' into develop

src/views/decoct/recipe/index.vue

@@ -53,6 +53,13 @@
             <el-option label="已打印" :value="1"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="方案状态:">
+          <el-select v-model="filterForm.schemeConfirmed" placeholder="请选择" size="mini" clearable>
+            <el-option label="全部" :value="''"></el-option>
+            <el-option label="未确认" :value="0"></el-option>
+            <el-option label="已确认" :value="1"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="剂型:">
           <el-select v-model="filterForm.dosageForm" placeholder="请选择" size="mini" clearable>
             <el-option :label="item.dictLabel" :value="item.dictValue" v-for="item in typeOptions" :key="item.dictCode"></el-option>
@@ -69,7 +76,7 @@
     </div>
     <!-- 表格展示 -->
     <div class="content">
-      <el-table :data="tableData" style="width: 100%" border v-loading="loading">
+      <el-table :data="tableData" style="width: 100%" border v-loading="loading" class="table-wrapper" :row-class-name="tableRowClassName">
         <el-table-column label="序号" width="50" align="center">
           <template slot-scope="{scope, $index}">
             <span>{{ $index+1 }}</span>
@@ -123,6 +130,12 @@
             <span v-else-if="scope.row.state==4">配送</span>
           </template>
         </el-table-column>
+        <el-table-column prop="schemeConfirmed" label="方案状态" min-width="80" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.schemeConfirmed==1">已确认</span>
+            <span v-else-if="scope.row.schemeConfirmed==0">未确认</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="operatingTime" label="接收时间" min-width="160" align="center"></el-table-column>
         <el-table-column prop="printTime" label="打印时间" min-width="160" align="center"></el-table-column>
         <el-table-column prop="printName" label="打印人" min-width="120" align="center"></el-table-column>
@@ -218,6 +231,7 @@ export default {
         isBehalf: 1,
         takingMethod: '',
         printFlag: '',
+        schemeConfirmed: '',
         dosageForm: '',
         code: ''
       },
@@ -242,6 +256,12 @@ export default {
     });
   },
   methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.schemeConfirmed == 0) {
+        return "warning-row";
+      }
+      return "";
+    },
     // 清空
     handleClear() {
       const now = dayjs().format("YYYY-MM-DD");
@@ -272,7 +292,7 @@ export default {
     // 详情按钮点击
     handleDetail(scope) {
       this.id = scope.row.id
-      if(scope.row.printFlag==0){
+      if (+scope.row.schemeConfirmed !== 1) {
         this.showOption = true;
         this.$nextTick(() => {
           this.$refs.editDialog.openDialog()
@@ -334,9 +354,15 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped>
+<style scoped>
 .page {
   text-align: center;
   margin-top: 20px;
 }
+.table-wrapper >>> .warning-row,
+.table-wrapper >>> .el-table__body tr.warning-row.current-row > td,
+.table-wrapper >>> .el-table__body tr.warning-row.hover-row > td {
+  background: #e6a23c;
+  color: #fff;
+}
 </style>