Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/data/components/additionDialog.vue

@@ -0,0 +1,133 @@
+<template>
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <el-form :model="formValue" :rules="rules" ref="formValue" class="demo-form-inline"
+             :label-position="labelPosition"
+             label-width="100px">
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="费用名称" prop="name">
+            <el-input v-model="formValue.name"></el-input>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="8">
+          <el-form-item label="国家编码" prop="code">
+            <el-input v-model="formValue.code"></el-input>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="8">
+          <el-form-item label="费用" >
+            <el-input type="number" v-model="formValue.price"></el-input>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+    <el-button v-if="isCreated == 3" @click="cancle('formValue')">取 消</el-button>
+    <el-button v-if="isCreated != 3 " @click="cancle('formValue')">取 消</el-button>
+    <el-button v-if="isCreated != 3" type="primary" @click="comfirm('formValue')">保 存</el-button>
+  </span>
+  </el-dialog>
+
+</template>
+
+<script>
+  export default {
+    name: 'diagnosisDialog',
+
+    data() {
+
+      return {
+        visibility: false,
+        labelPosition: 'right',
+        isClose: false,
+        form: {
+          name: '',
+          code: '',
+          price: '',
+
+        },
+        resetForm: {
+          name: '',
+          code: '',
+          price: '',
+          wubi: ''
+        },
+        rules: {
+          name: [
+            { required: true, message: '请输入费用名称', trigger: 'blur' }
+          ],
+          code: [
+            { required: true, message: '请输入国家编码', trigger: 'blur' }
+          ]
+
+        }
+      }
+    },
+    props: {
+
+      titles: {
+        type: String,
+        default: ''
+      },
+      formValue: {
+        type: Object
+      },
+      type: {
+        type: Number,
+        default: 1
+
+      },
+      isCreated: {
+        type: Number,
+        default: 1
+
+      }
+    },
+    methods: {
+      show: function() {
+        this.visibility = true
+
+      }, hide: function() {
+        this.visibility = false
+      },
+      cancle: function(formName) {
+        this.$emit('dialog-cancle', this.getValue())
+        this.$refs['formValue'].resetFields()
+      },
+      comfirm: function(formName) {
+        this.$refs['formValue'].validate((valid) => {
+          if (valid) {
+            let value = {}
+            value = this.getValue()
+            this.$emit('dialog-comfirm', value)
+            this.form = Object.assign({}, this.resetForm)
+
+          }
+        })
+      },
+      getValue: function() {
+        let form = {}
+        form = this.formValue
+        form['title'] = this.titles
+        form['type'] = this.type
+        form['isCreated'] = this.isCreated
+        return form
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/data/components/addtion.vue

@@ -0,0 +1,345 @@
+<template>
+  <div class="main-contain">
+    <div class=" sign-and-weigh-box" style="background: white">
+      <!--<manufacturer-or-dealer-dialog-->
+      <!--ref="dialog"-->
+      <!--:titles="manufacturerDialog.titles"-->
+      <!--:formValue="manufacturerDialog.formValue"-->
+      <!--:visibility="manufacturerDialog.isVisibility"-->
+      <!--:type="manufacturerDialog.type"-->
+      <!--:isCreated="manufacturerDialog.isCreated"-->
+      <!--v-on:dialog-comfirm="manufacturerDialogComfirm"-->
+      <!--v-on:dialog-cancle="manufacturerDialogCancle"-->
+      <!--&gt;</manufacturer-or-dealer-dialog>-->
+      <addition-dialog
+        ref="dialog"
+        :titles="Dialog.titles"
+        :formValue="Dialog.formValue"
+        :visibility="Dialog.isVisibility"
+        :type="Dialog.type"
+        :isCreated="Dialog.isCreated"
+        v-on:dialog-comfirm="dialogComfirm"
+        v-on:dialog-cancle="dialogCancle"
+
+      ></addition-dialog>
+
+
+      <el-row :gutter="15">
+        <el-col>
+          <div>
+            <el-button
+              size="small"
+              icon="el-icon-circle-plus-outline"
+              style="float: right;margin-bottom: 15px"
+              type="primary"
+              @click="showDialog"
+            >新增
+            </el-button>
+          </div>
+
+          <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="manufacturerData"
+            style="width: 100%"
+            border
+            v-loading="loading"
+          >
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.code }}
+              </template>
+            </el-table-column>
+
+
+
+            <el-table-column label="费用名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.name }}
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="金额" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.price }}元
+              </template>
+            </el-table-column>
+
+
+
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="编辑"
+                  placement="top"
+                >
+                  <el-button
+                    size="small"
+                    type="primary"
+                    icon="el-icon-edit-outline"
+                    @click="handleEdit(scope.$index, scope.row)"
+                  >
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="删除"
+                  placement="top"
+                >
+                  <el-button
+                    size="small"
+                    type="danger"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.$index, scope.row)"
+                  >
+                  </el-button>
+                </el-tooltip>
+
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    createAddition,
+    modifyAddition,
+    getAdditionList,
+    deleteAddition,
+    GetAddition
+  } from '@/api/data'
+  import AdditionDialog from './additionDialog'
+
+  export default {
+    components: {
+      AdditionDialog,
+    },
+    name: 'addtion',
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        manufacturerData: [],
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+
+        page: 1,
+        limit: 10,
+        loading: false,
+
+        manufacturer_code: '',
+        editId: '',
+        editIndex: '',
+        Dialog: {
+          titles: '新增',
+          isVisibility: false,
+          isCreated: 1, //1.创建 2.编辑 3.查看详情
+          formValue: {
+            name: '',
+            code: '',
+            price: '',
+
+          },
+          resetForm: {
+            name: '',
+            code: '',
+            price: '',
+          }
+        }
+      }
+    },
+    methods: {
+      handleEdit: function(index, row) {
+        this.editId = row.id
+        this.editIndex = index
+        let params = {
+          id: row.id
+        }
+        GetAddition(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.class_name =
+              response.data.data.addition.name
+            this.Dialog.formValue.content_code =
+              response.data.data.addition.code
+            this.Dialog.formValue.price =
+              response.data.data.addition.price
+
+            this.Dialog.isCreated = 2
+            this.$refs.dialog.show()
+
+          }
+        })
+      },
+      handleDelete: function(index, row) {
+        this.$confirm('确认删除这条记录?', '删除记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let params = {
+              id: row.id
+            }
+            deleteAddition(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.manufacturerData.splice(index, 1)
+                this.$message.success('厂家已经删除')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
+      showDetails: function(index, row) {
+        let params = {
+          id: row.id
+        }
+        GetAddition(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.name =
+              response.data.data.addition.name
+            this.Dialog.formValue.code =
+              response.data.data.addition.code
+            this.Dialog.formValue.price =
+              response.data.data.addition.price
+
+
+            this.Dialog.isCreated = 3
+            this.Dialog.isVisibility = true
+          }
+        })
+      },
+      dialogComfirm: function(val) {
+        // this.manufacturerDialog.isVisibility = false
+        this.$refs.dialog.hide()
+        if (val.isCreated == 2) {
+          //修改
+          let params = {
+            name: val.name,
+            code: val.code,
+            price: val.price,
+            id: this.editId,
+
+          }
+          modifyAddition(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.manufacturerData[this.editIndex].name =
+                response.data.data.addition.name
+              this.manufacturerData[this.editIndex].code =
+                response.data.data.addition.code
+              this.manufacturerData[this.editIndex].price =
+                response.data.data.addition.price
+              this.$message.success('修改成功')
+            }
+          })
+        } else if (val.isCreated == 1) {
+          //新增
+          createAddition(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.manufacturerData.unshift(response.data.data.addition)
+
+              this.$message.success('新增成功')
+            }
+          })
+        }
+      },
+      dialogCancle: function() {
+        this.$refs.dialog.hide()
+      },
+      showDialog: function() {
+        this.Dialog.formValue = Object.assign(
+          {},
+          this.Dialog.resetForm
+        )
+        this.$refs.dialog.show()
+        this.Dialog.isCreated = 1
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+      },
+      getList() {
+        let params = {
+          page: this.page,
+          limit: this.limit
+        }
+        this.loading = true
+        getAdditionList(params).then(response => {
+          if (response.data.state == 0) {
+            this.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.loading = false
+            this.total = response.data.data.total
+            this.manufacturerData = []
+            for (let i = 0; i < response.data.data.addition.length; i++) {
+              this.manufacturerData.push(response.data.data.addition[i])
+            }
+          }
+        })
+      }
+    },
+    created() {
+      this.getList()
+    }
+  }
+</script>
+
+<style lang="scss">
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+</style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -429,8 +429,10 @@
             }
           }
         }
-        for (let i = 0; i < this.addtions_charge.length; i++){
-          total = total +  this.addtions_charge[i].price
+        if(this.addtions_charge != null) {
+          for (let i = 0; i < this.addtions_charge.length; i++) {
+            total = total + this.addtions_charge[i].price
+          }
         }
         return Math.floor(total * 100) / 100
       },
@@ -503,23 +505,24 @@
             }
 
             if (info.user_type == 2 || info.user_type == 1) {
+
+
+              this.doctorValue = info.admin_user_id
+
+
               if (info.department_id == 0) {
-                console.log('33333')
 
                 if (this.department.length > 0) {
-                  console.log('6666666666')
-
                   this.departmentValue = this.department[0].id
                 } else {
-                  console.log('7777777777')
-
                   this.departmentValue = ''
                 }
               } else {
-                console.log('5555555')
-
                 this.departmentValue = info.department_id
               }
+            }else{
+              this.doctorValue = this.doctors[0].admin_user_id
+
             }
 
           }