518合并代码

src/api/config.js

@@ -35,7 +35,7 @@ export function getConfig(params) {
   return request({
     url: '/api/dataupload/config/get',
     method: 'get',
-    params:params
+    params: params
   })
 }
 
@@ -43,35 +43,29 @@ export function getIsDocking(params) {
   return request({
     url: '/api/dataupload/is_docking/get',
     method: 'get',
-    params:params
+    params: params
 
   })
 }
 
-
-
-
-
 export function getAllSystemPrescription() {
   return request({
     url: '/api/systemprescription/all',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
 export function getSystemPrescription(params) {
   return request({
     url: '/api/systemprescription/get',
     method: 'get',
-    params:params
+    params: params
 
   })
 }
 
-
 export function postSystemPrescription(params) {
-  console.log("params2222222",params)
+  console.log('params2222222', params)
   return request({
     url: '/api/systemprescription/commit',
     method: 'post',
@@ -80,54 +74,45 @@ export function postSystemPrescription(params) {
   })
 }
 
-
-export function updateSystemPrescription(id,params) {
+export function updateSystemPrescription(id, params) {
   return request({
-    url: '/api/systemprescription/update?id='+id,
+    url: '/api/systemprescription/update?id=' + id,
     method: 'post',
     data: params
 
   })
 }
 
-
 export function getOrgs() {
   return request({
     url: '/api/public/orgs',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
-
 export function changeOrg(params) {
   return request({
     url: '/api/org/change',
     method: 'post',
-    params:params,
+    params: params
   })
 }
 
-
-
 export function generateLog(params) {
   return request({
     url: '/api/log/generate',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
 export function getAllIsOpenInit() {
   return request({
     url: '/api/isopen/init',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
 export function postXtHisIsOpen(params) {
   return request({
     url: '/api/xtconfig/isopen',
@@ -136,71 +121,68 @@ export function postXtHisIsOpen(params) {
   })
 }
 
-
-export function postMonitorIsOpen(params){
-  console.log("params",params)
+export function postMonitorIsOpen(params) {
+  console.log('params', params)
   return request({
-    url:"/api/monitor/open",
-    method:"get",
-    params:params
+    url: '/api/monitor/open',
+    method: 'get',
+    params: params
   })
 }
 
-
-export function getMonitorConfig(params){
-
+export function getMonitorConfig(params) {
   return request({
-    url:"/api/monitor/getmonitorconfig",
-    method:"Get",
-    params:params,
+    url: '/api/monitor/getmonitorconfig',
+    method: 'Get',
+    params: params
   })
 }
 
-
-export function addOrderConfig(params){
-
+export function addOrderConfig(params) {
   return request({
-    url:"/api/order/addorderconfig",
-    method:"Get",
-    params:params,
+    url: '/api/order/addorderconfig',
+    method: 'Get',
+    params: params
 
   })
 }
 
-export function getOrderConfig(params){
-
+export function getOrderConfig(params) {
   return request({
-    url:"/api/order/getorderconfig",
-    method:"get",
-    params:params,
+    url: '/api/order/getorderconfig',
+    method: 'get',
+    params: params
   })
 }
 
-export function changeFuncPrint(params){
-
+export function changeFuncPrint(params) {
   return request({
-    url:"/api/order/changefuncprint",
-    method:"get",
-    params:params
+    url: '/api/order/changefuncprint',
+    method: 'get',
+    params: params
   })
 }
 
-export function getDataPrintList(params){
-
+export function getDataPrintList(params) {
   return request({
-    url:"/api/order/getdataprint",
-    method:"get",
-    params:params
+    url: '/api/order/getdataprint',
+    method: 'get',
+    params: params
   })
 }
 
+export function postXtHisProjectIsOpen(params) {
+  return request({
+    url: '/api/xtconfigproject/isopen',
+    method: 'post',
+    params: params
+  })
+}
 
-
-export function postXtHisProjectIsOpen(params){
-
+export function changeStockSetting(params) {
   return request({
-    url:"/api/xtconfigproject/isopen",
-    method:"post",
-    params:params
+    url: '/api/changestocksetting/isopen',
+    method: 'get',
+    params: params
   })
 }

src/xt_pages/data/basicConfig.vue

@@ -32,6 +32,9 @@
             <p style="margin-top:20px;">门诊处方项目同步到透析医嘱：
                 <el-switch v-model="is_open_xt_his_project" @change="changeFuncProject"></el-switch>
             </p>
+            <p style="margin-top:20px;">耗材先出库再执行：
+                <el-switch v-model="is_open_is_type" @change="changeFuncType"></el-switch>
+            </p>
         </div>
 
 
@@ -87,7 +90,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -105,6 +108,7 @@ export default {
       is_open_order:false,
       is_open_print:false,
       is_open_xt_his_project: false,
+      is_open_is_type:false,
     };
   },
   methods: {
@@ -126,6 +130,12 @@ export default {
               this.is_open_xt_his_project = false
             }
 
+            if(response.data.data.is_open_stock == 1){
+              this.is_open_is_type = true
+            }else{
+              this.is_open_is_type = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -301,6 +311,23 @@ export default {
            }
          }
       })
+    },
+    changeFuncType(){
+       var is_type = 2
+       if(this.is_open_is_type == false){
+         is_type = 2
+       }
+       if(this.is_open_is_type == true){
+         is_type = 1
+       }
+       var params = {
+         is_type:is_type,
+       }
+      changeStockSetting(params).then(response=>{
+        if(response.data.state == 1){
+           this.$message.success("保存成功!")
+        }
+      })
     }
 
   },

src/xt_pages/data/components/addInspection.vue

@@ -94,6 +94,7 @@
             filterable
             placeholder="请选择"
             @change="changeProject"
+            
           >
             <el-option
               v-for="item in projectList"
@@ -249,7 +250,8 @@ export default {
         }
       }
     },
-    changeProject() {
+    changeProject(val) {
+      console.log("i23232323323",val.id)
       this.form.number = 1;
     },
     querySearch(queryString, cb) {
@@ -270,6 +272,7 @@ export default {
       };
     },
     handleSelect(val) {
+      console.log("val3223322323232323",val)
       this.project_name = val.project_name;
       this.form.project_detail = val.id;
     },
@@ -405,45 +408,26 @@ export default {
       });
     },
     addProjectList() {
-      console.log(this.tableData, "this.tableData");
-      console.log(this.form.project_detail, "form.project_detail");
-      let obj = {new_id:this.form.project_detail}
-      if (this.tableData.length <= 0) {
+        if(this.tableData.length > 0){
+          for(let i=0;i<this.tableData.length;i++){
+            if(this.tableData[i].new_id == this.form.project_detail){
+               this.$message.error("项目名称已存在")
+               return
+            }
+          }
+        }
         for (let i = 0; i < this.projectList.length; i++) {
           if (this.form.project_detail == this.projectList[i].new_id) {
-            this.projectList[i].number = this.form.number;
-            this.projectList[i].number = this.projectList[i].number.toString();
-
-            this.tableData.push(this.projectList[i]);
-            this.form.project_detail = "";
-            this.form.number = 1;
+            this.projectList[i].number = this.form.number
+            this.projectList[i].number = this.projectList[i].number.toString()
+            
+            this.tableData.push(this.projectList[i])
+            this.form.project_detail = ''
+            this.form.number = 1
           }
         }
-      } else {
-        console.log(obj,'obj')
-        this.tableData.forEach((el) => {
-          if (this.form.project_detail == el.new_id) {
-            this.$message.error("已存在！");
-            return;
-          } else {
-            console.log("oo");
-
-            // for (let i = 0; i < this.projectList.length; i++) {
-            //   if (this.form.project_detail == this.projectList[i].new_id) {
-            //     this.projectList[i].number = this.form.number;
-            //     this.projectList[i].number =
-            //       this.projectList[i].number.toString();
-
-            //     this.tableData.push(this.projectList[i]);
-            //     this.form.project_detail = "";
-            //     this.form.number = 1;
-            //   }
-            // }
-          }
-        });
-
-      }
-    },
+       
+      },
     DeleteProject(id, index) {
       this.$confirm("确认删除此项目吗?", "删除", {
         confirmButtonText: "确 定",

src/xt_pages/data/components/editInspection.vue

@@ -347,6 +347,21 @@
         return name
       },
       addProjectList() {
+       
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+          if(this.form.project_detail == this.projectList[i].new_id){
+             project_name = this.projectList[i].project_name
+          }
+        }
+        if(this.tableData.length > 0){
+          for(let i=0;i<this.tableData.length;i++){
+            if(this.tableData[i].project_name == project_name){
+               this.$message.error("项目名称已存在")
+               return
+            }
+          }
+        }
         for (let i = 0; i < this.projectList.length; i++) {
           if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -298,14 +298,6 @@
                           <span v-if="scope.row.sum_count/scope.row.min_number>0">{{ Math.floor(scope.row.sum_count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
                           <span v-if="scope.row.sum_count%scope.row.min_number>0"> {{ scope.row.sum_count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
 
-                                          <span
-                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
-                                              <span
-                                                  v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
-                                              <span
-                                                  v-if="scope.row.count%scope.row.min_number>0"> {{ scope.row.count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
-                                            </span>
-                        <span v-else> {{ scope.row.total }}{{ scope.row.total ? scope.row.min_unit : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
@@ -400,11 +392,6 @@
                     </el-table-column>
                     <el-table-column label="库存" width="40">
                       <template slot-scope="scope">
-                                                <span
-                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
-                                                    {{ scope.row.stock_count }}
-                                                </span>
-                        <span v-else> {{ scope.row.total }}</span>
                         <!-- <span
                             v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
                             {{ scope.row.stock_count }}

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -85,20 +85,20 @@
 
 
           <div>
-<!--            <el-button size="small"-->
-<!--                       @click="openZb(1)"-->
-<!--                       type="primary">登记-->
-<!--            </el-button>-->
-
-<!--            <el-button  size="small"-->
-<!--                       @click="openZb(2)"-->
-<!--                       type="primary">记账-->
-<!--            </el-button>-->
-
-<!--            <el-button   size="small"-->
-<!--                       @click="openZb(3)"-->
-<!--                       type="primary">撤销记账-->
-<!--            </el-button>-->
+           <el-button size="small"
+                      @click="openZb(1)"
+                      type="primary">登记
+          </el-button>
+
+            <el-button  size="small"
+                       @click="openZb(2)"
+                      type="primary">记账
+            </el-button>
+
+            <el-button   size="small"
+                       @click="openZb(3)"
+                       type="primary">撤销记账
+           </el-button>
 
 
             <el-button v-loading="loadingone" size="small"

src/xt_pages/stock/index.vue

@@ -37,6 +37,7 @@
   import GoodType from './config/goodType'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import AutomaticReduce from './config/automaticReduce'
+  
   export default {
     name: 'service',
     components: {
@@ -45,7 +46,8 @@
       GoodInfo,
       Manufacturer,
       Dealer,
-      BreadCrumb
+      BreadCrumb,
+      
     },
     data() {
       return {

src/xt_pages/user/components/PatientForm.vue

@@ -1724,6 +1724,8 @@ export default {
               this.form.expense_kind = patietInfo.expense_kind;
             }
 
+            this.form.troble_shoot = patietInfo.troble_shoot
+
             this.form.first_treatment_date = uParseTime(
               patietInfo.first_treatment_date,
               "{y}-{m}-{d}"