Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/supply.js

@@ -9,6 +9,7 @@ export function getInitOrder(params) {
 }
 
 export function savePurchaseOrder(data, supplier_name, start_time, end_time, rate_of_concession, discount_amount) {
+  console.log('data32323323232', data)
   return request({
     url: '/api/supply/savepurchaseorder?supplier_name=' + supplier_name + '&start_time=' + start_time + '&end_time=' + end_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount,
     method: 'post',

src/router/modules/supply.js

@@ -37,7 +37,10 @@ export default {
       path: '/purchase/order/add',
       component: () => import('@/xt_pages/supply/components/addPurchaseOrder'),
       name: 'addPurchaseOrder',
-      meta: { title: 'addPurchaseOrder', noCache: true }
+      meta: { title: 'addPurchaseOrder', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
     }
   ]
 }

src/xt_pages/hospitalStation/summary.vue

@@ -566,7 +566,7 @@
         }
       },
       toPrint(row) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138)) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10278)) {
           this.statementVisible9504 = true
           let obj = {
             order_id: row.id,

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -129,7 +129,12 @@
                                                 <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                                             </el-table-column>
                                             <el-table-column label="规格" width="60">
-                                                <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
+                                                <template slot-scope="scope">
+                                                  <!-- {{ scope.row.drug_spec }} -->
+                                                   <span
+                                                       v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>
+                                                       {{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
+                                                  </template>
                                             </el-table-column>
                                             <el-table-column label="单价" width="40">
                                                 <template slot-scope="scope">{{ scope.row.retail_price }}</template>

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -6,7 +6,7 @@
 <div class="app-container ">
     <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
     <div>
-        <span>供应商:</span>
+        <span style="color:red">*</span><span>供应商:</span>
         <el-select v-model="supplier_name" style="width:140px;margin-right:10px;" placeholder="请选择"
         @change="changeTypeName">
         <el-option
@@ -48,36 +48,45 @@
    
     </div>
     <div>
-        <el-button size="small" type="primary" @click="savePurchaseOrder">保存</el-button>
+        <el-button size="small" type="primary" @click="savePurchaseOrder" v-show="showTwo">保存</el-button>
+        <el-button size="small" type="primary" @click="updatePurchaseOrder" v-show="showOne">修改</el-button>
     </div>
     </div>
 
-
+   <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
     <el-table
     :row-style="{ color: '#303133' }"
     :header-cell-style="{
         backgroundColor: 'rgb(245, 247, 250)',
         color: '#606266'
     }"
-    :data="tableList"
+    :data="recordInfo.tableList"
     :class="signAndWeighBoxPatients"
     border
     style="width: 100%"
     max-height="450"
     >
-    <el-table-column label="商品" align="center" width="200px">
+    <el-table-column align="center" width="200px">
+        <template slot="header" slot-scope="scope">
+            <span>商品<span style="color: red">*</span></span>
+        </template>
         <template slot-scope="scope">
+           <el-form-item required prop="name"> 
             <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)">
-            <el-option
-                v-for="(item,index) in tabList"
-                :key="index"
-                :label="item.supply_name"
-                :value="item">
-            </el-option>
-            </el-select>
+                <el-option
+                    v-for="(item,index) in tabList"
+                    :key="index"
+                    :label="item.supply_name"
+                    :value="item">
+                </el-option>
+             </el-select>
+           </el-form-item> 
         </template>
     </el-table-column>
-    <el-table-column label="商品类别" align="center" width="150px">
+    <el-table-column  align="center" width="150px">
+        <template slot="header" slot-scope="scope">
+            <span>商品类别</span>
+        </template>
         <template slot-scope="scope">
             <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true"></el-input>
         </template>
@@ -93,8 +102,13 @@
         </template>
     </el-table-column>
     <el-table-column label="数量" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>数量<span style="color: red">*</span></span>
+        </template>
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_count" style="width:80px"></el-input>
+          <el-form-item :rules="tableRules.supply_count" required prop="supply_count">
+          <el-input v-model="scope.row.supply_count" style="width:80px"></el-input>
+          </el-form-item>  
         </template>
     </el-table-column>
 
@@ -151,6 +165,7 @@
         </template>
     </el-table-column>
   </el-table>
+</el-form>
    <div style="margin-top:10px">
         <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession"></el-input>%</span>
         
@@ -164,7 +179,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getInitOrder} from "@/api/supply"
+import {getInitOrder,savePurchaseOrder} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 created() {
@@ -188,9 +203,14 @@ BreadCrumb
 data() {
 return {
     crumbs: [
-    { path: false, name: "购货订单" },
-    { path: "/spply/query", name: "新增购货订单" }
+       { path: false, name: "购货订单" },
+       { path: "/spply/query", name: "新增购货订单" }
     ],
+    showTwo:true,
+    showOne:false,
+    recordInfo: {
+      tableList:[],  
+    },
     keywords: "",
     total: 0,
     multipleSelection: [],
@@ -203,7 +223,6 @@ return {
     goodInfo: [],
     org_id:0,
     types:[],
-    tableList:[],
     tyep_name:"",
     form:{
     manufacturer_id:"",
@@ -217,9 +236,16 @@ return {
     supplyList:[],
     rate_of_concession:"",
     discount_amount:"",
+    start_time:new Date(),
+    end_time:new Date(),
+    tableRules: {
+     name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
+     supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+ },
 };
 },
 methods:{
+
 getInitOrder(){
     getInitOrder().then(response=>{
     if(response.data.state == 1){
@@ -293,21 +319,26 @@ changeGoodName(val){
 },
 changeName(val){
     
-   for(let i=0;i<this.tableList.length;i++){
+   for(let i=0;i<this.recordInfo.tableList.length;i++){
     if(this.currentIndex == i){
-        this.tableList[i].id = val.id
-        this.tableList[i].type = val.type
-        this.tableList[i].name = val.name
-        this.tableList[i].supply_name = val.supply_name
-        this.tableList[i].supply_type = val.supply_type
-        this.tableList[i].supply_specification_name = val.supply_specification_name
-        this.tableList[i].supply_total = val.supply_total
-        this.tableList[i].supply_count = val.supply_count
-        this.tableList[i].supply_price = val.supply_price
-        this.tableList[i].supply_total_price = val.supply_total_price
-        this.tableList[i].supply_manufacturer = val.supply_manufacturer
-        this.tableList[i].supply_license_number = val.supply_license_number
-        this.tableList[i].supply_remake = val.supply_remake
+        this.recordInfo.tableList[i].id = val.id
+        this.recordInfo.tableList[i].type = val.type
+        this.recordInfo.tableList[i].name = val.name
+        this.recordInfo.tableList[i].supply_name = val.supply_name
+        this.recordInfo.tableList[i].supply_type = val.supply_type
+        this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name
+        this.recordInfo.tableList[i].supply_total = val.supply_total
+        if(val.supply_count == NaN){
+           this.recordInfo.tableList[i].supply_count = ""
+        }else{
+          this.recordInfo.tableList[i].supply_count = val.supply_count?val.supply_count:""
+        }
+       
+        this.recordInfo.tableList[i].supply_price = val.supply_price?val.supply_price:""
+        this.recordInfo.tableList[i].supply_total_price = val.supply_total_price?val.supply_total_price:""
+        this.recordInfo.tableList[i].supply_manufacturer = val.supply_manufacturer
+        this.recordInfo.tableList[i].supply_license_number = val.supply_license_number
+        this.recordInfo.tableList[i].supply_remake = val.supply_remake
      }
     }
     
@@ -319,38 +350,62 @@ handleEdit(){
     tempObj['supply_name'] = ""
     tempObj['supply_type'] = ""
     tempObj['supply_specification_name'] = ''
-    tempObj['supply_total'] = ''
-    tempObj['supply_count'] = ''
-    tempObj['supply_price'] = ''
-    tempObj['supply_total_price'] = ''
+    tempObj['supply_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
     tempObj['supply_manufacturer'] = ''
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
-    this.tableList.push(tempObj)  
+    this.recordInfo.tableList.push(tempObj)  
 },
 handleDelete: function(index, row) {
-  if (this.tableList.length <= 1) {
+  if (this.recordInfo.tableList.length <= 1) {
         this.$message.error('只有一条记录的时候无法删除')
         return
    } else {
-        this.tableList.splice(index, 1)
+        this.recordInfo.tableList.splice(index, 1)
    }
 },
+
+
 savePurchaseOrder(){
-     
-     var params = {
+   console.log("tablelsit323232",this.recordInfo.tableList)
+   console.log("hhh232323",this.$refs)
+    this.$refs["tableForm"].validate((valid)=>{
+      if(valid){
+        var params = {
         supplier_name:this.supplier_name,
         start_time:this.start_time,
         end_time:this.end_time,
         rate_of_concession:this.rate_of_concession,
         discount_amount:this.discount_amount,
-     }
-    console.log("partam2332232332",params)
-    console.log("tablelsit323232",this.tabList)
-    savePurchaseOrder(this.tabList,this.supplier_name,this.start_time,this.end_time,this.rate_of_concession,this.discount_amount).then(response=>{
+        }
+        console.log("partam2332232332",params)
+        console.log("tablelsit323232",this.recordInfo.tableList)
+        for(let i=0;i<this.recordInfo.tableList.length;i++){
+            this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count) 
+            for(let j=0;j<this.manufactuerList.length;j++){
+                if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
+                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id 
+                }
 
-    })  
+            } 
+        }
+        return
+        savePurchaseOrder(this.recordInfo.tableList,this.supplier_name,this.start_time,this.end_time,this.rate_of_concession,this.discount_amount).then(response=>{
+            if(response.data.state == 1){
+                var order =  response.data.data.order
+                this.$message.success("保存成功!")
+                this.showTwo = false
+                this.showOne = true
+            }
+        }) 
+      }  
+
+   })  
+   
 },
 
 changeTypeName(){
@@ -408,6 +463,9 @@ calculate: function(val) {
     }
     return Math.round(parseFloat(val) * 100) / 100;
   },
+ updatePurchaseOrder(){
+
+ }
 },
 created(){
     const tempObj = {}
@@ -416,15 +474,15 @@ created(){
     tempObj['supply_name'] = ""
     tempObj['supply_type'] = ""
     tempObj['supply_specification_name'] = ''
-    tempObj['supply_total'] = ''
-    tempObj['supply_count'] = ''
-    tempObj['supply_price'] = ''
-    tempObj['supply_total_price'] = ''
+    tempObj['supply_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
     tempObj['supply_manufacturer'] = ''
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
-    this.tableList.push(tempObj)  
+    this.recordInfo.tableList.push(tempObj)  
     this.getInitOrder()  
 }
 };

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -161,19 +161,18 @@
       >
       </el-pagination>
 
-       <add-supply ref="addSupply"></add-supply>
     </div>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import addSupply from "./components/addSupply.vue"
+
 
 export default {
   name: "stockIn",
    components: {
-     addSupply
+     
    },
   created() {
     this.org_id =  this.$store.getters.xt_user.org_id
@@ -212,13 +211,30 @@ export default {
       org_id:0,
       types:[],
       tableList:[],
-      tyep_name:"",
+      type_name:"",
     };
   },
   methods:{
      toAdd(){
-       console.log("res32323232323223",this.$refs)  
-       this.$refs.addSupply.show()  
+       this.$router.push({path:"/purchase/order/add"})
+     },
+     changeTypeName(){
+
+     },
+     startTimeChange(){
+
+     },
+     endTimeChange(){
+
+     },
+     search(){
+
+     },
+     handleSizeChange(){
+
+     },
+     handleCurrentChange(){
+
      } 
   }
 };