数据

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-     // host: 'xt.test.sgjyun.com',
+    host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/router/index_路由未分离前.js

@@ -604,7 +604,7 @@ export const xt_asyncRouterMap = [
         name: 'weight',
         meta: { title: 'weight', noCache: true }
       },
-   
+
       {
         path: '/patients/patient/:id/dialysisRecord',
         component: () => import('@/xt_pages/user/dialysisRecord'),
@@ -860,21 +860,24 @@ export const xt_asyncRouterMap = [
         hidden: true,
         is_menu: false,
         meta: { title: 'stockOutOrderAdd', noCache: true }
-      }, {
+      },
+      {
         path: '/stock/out/detail',
         component: () => import('@/xt_pages/stock/stockOutDetail'),
         name: 'stockOutDetail',
         hidden: true,
         is_menu: false,
         meta: { title: 'stockOutDetail', noCache: true }
-      }, {
+      },
+      {
         path: '/stock/cancel/add',
         component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
         name: 'cancelStockOrderAdd',
         hidden: true,
         is_menu: false,
         meta: { title: 'cancelStockOrderAdd', noCache: true }
-      }, {
+      },
+      {
         path: '/stock/cancel/detail',
         component: () => import('@/xt_pages/stock/cancelStockDetail'),
         name: 'cancelStockDetail',
@@ -887,8 +890,8 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/index'),
         name: 'config',
         meta: { title: 'config' }
-      },
-     
+      }
+
     ]
   },
   {

src/router/modules/drugs.js

@@ -13,40 +13,40 @@ export default {
   },
   children: [
     {
-        path: '/stock/drugs/stock/query',
-        component: () => import('@/xt_pages/stock/drugs/query'),
-        name: 'drugsQuery',
-        meta: { title: 'drugsQuery', noCache: true }
+      path: '/stock/drugs/stock/query',
+      component: () => import('@/xt_pages/stock/drugs/query'),
+      name: 'drugsQuery',
+      meta: { title: 'drugsQuery', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/in',
-        component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
-        name: 'drugsStockIn',
-        meta: { title: 'drugsStockIn', noCache: true }
+      path: '/stock/drugs/stock/in',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
+      name: 'drugsStockIn',
+      meta: { title: 'drugsStockIn', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/out',
-        component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
-        name: 'drugsStockOut',
-        meta: { title: 'drugsStockOut', noCache: true }
+      path: '/stock/drugs/stock/out',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
+      name: 'drugsStockOut',
+      meta: { title: 'drugsStockOut', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/return',
-        component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
-        name: 'drugsStockReturn',
-        meta: { title: 'drugsStockReturn', noCache: true }
+      path: '/stock/drugs/stock/return',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
+      name: 'drugsStockReturn',
+      meta: { title: 'drugsStockReturn', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/cancel',
-        component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
-        name: 'drugsStockCancel',
-        meta: { title: 'drugsStockCancel', noCache: true }
+      path: '/stock/drugs/stock/cancel',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
+      name: 'drugsStockCancel',
+      meta: { title: 'drugsStockCancel', noCache: true }
     },
     {
-      path:'/stock/drugs/stock/detail',
-      component:()=>import('@/xt_pages/stock/drugs/drugIndex'),
-      name:'drugDetail',
-      meta:{title:'明细查询',noCache:true}
+      path: '/stock/drugs/stock/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugIndex'),
+      name: 'drugDetail',
+      meta: { title: '明细查询', noCache: true }
     },
     // {
     //     path: '/stock/drugs/stock/adjustPrice',
@@ -122,7 +122,7 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelDrugStockOrderAdd', noCache: true }
-    },{
+    }, {
       path: '/drugstock/cancel/detail',
       component: () => import('@/xt_pages/stock/drugs/cancelDrugStockDetail'),
       name: 'cancelDrugStockDetail',
@@ -139,31 +139,40 @@ export default {
       meta: { title: 'drugStockUserDetail', noCache: true }
     },
 
-    //编辑药品入库单
+    // 编辑药品入库单
     {
-      path:'/drugstock/in/order/edit',
-      component:()=>import('@/xt_pages/stock/drugs/drugStockInOrderEdit'),
-      name:'drugStockInOrderEdit',
-      hidden:true,
-      is_menu:false,
+      path: '/drugstock/in/order/edit',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderEdit'),
+      name: 'drugStockInOrderEdit',
+      hidden: true,
+      is_menu: false,
       meta: { title: 'drugStockInOrderEdit', noCache: true }
     },
 
     {
-      path:'/drugstock/in/drugstockflow',
-      component:()=>import('@/xt_pages/stock/drugs/drugStockFlow'),
-      name:"drugStockFlow",
-      hidden:true,
-      is_menu:false,
-      meta:{title:"drugStockFlow",noCache:true}
+      path: '/drugstock/in/drugstockflow',
+      component: () => import('@/xt_pages/stock/drugs/drugStockFlow'),
+      name: 'drugStockFlow',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockFlow', noCache: true }
+    },
+    {
+      path: '/drugstock/in/drugbatchnumber',
+      component: () => import('@/xt_pages/stock/drugs/drugBatchNumber'),
+      name: 'drugBatchNumber',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugBatchNumber', noCache: true }
     },
     {
-      path:'/drugstock/in/drugbatchnumber',
-      component:()=>import('@/xt_pages/stock/drugs/drugBatchNumber'),
-      name:"drugBatchNumber",
-      hidden:true,
-      is_menu:false,
-      meta:{title:"drugBatchNumber",noCache:true}
+      path: '/stock/stockoutorderedit',
+      component: () => import('@/xt_pages/stock/stockOutOrderEdit'),
+      name: 'stockOutOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockOutOrderEdit', noCache: true }
     }
+
   ]
 }

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -1308,13 +1308,16 @@
                 type: 'success',
                 duration: 2000
               })
+              var msg = response.data.data.msg
+              if(msg == "ok"){
+                 this.$message.error("请入库,库存不足")
+              }
+            
               var exid = response.data.data.advice.id
               if (response.data.data.advice.parent_id > 0) {
                 exid = response.data.data.advice.parent_id
               }
-              // if (this.currentRow.parent_id > 0) {
-              //     exid = this.currentRow.parent_id;
-              // }
+             
               this.currentRow.execution_state = 1
               this.currentRow.execution_staff =
                 response.data.data.advice.execution_staff

src/xt_pages/stock/stockOutOrder.vue

@@ -552,22 +552,6 @@ export default {
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
 
-
-      
-    // var date1 = new Date();
-    // var date2 = new Date(date1);
-
-    // //-30为30天前，+30可以获得30天后的日期
-    // date2.setDate(date1.getDate() - 30);
-
-    // //30天前（月份判断是否小于10，小于10的前面+0）
-    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
-      
-    // //当前日期
-    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
-
-    //  this.start_time = agoDay
-    //  console.log("333333332222",this.start_time)
     this.start_time =
       nowYear +
       "-" +
@@ -815,11 +799,12 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      
-      this.$router.push({
-        name: "stockOutDetail",
-        query: { id: row.id, type: this.type,warehouse_out_time:row.warehouse_out_time }
-      });
+      // this.$router.push({
+      //   name: "stockOutDetail",
+      //   query: { id: row.id, type: this.type,warehouse_out_time:row.warehouse_out_time }
+      // });
+      this.$router.push({path:'/stock/stockoutorderedit?id='+row.id})
+       
     },
     handleDelete: function(index, row) {
       const ids = [];

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -140,7 +140,6 @@
                   placeholder="请输入商品类型"
                   v-model="scope.row.good_type_id"
                   :value="typeName(scope.row.good_type_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
                 ></el-input>
               </el-form-item>
             </template>
@@ -654,9 +653,9 @@ export default {
             this.recordInfo.recordData[i].price = val.buy_price
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
-          }
-        }
+         }
       }
+    }
   },
   created() {
     var nowDate = new Date();

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -13,13 +13,7 @@
 
     <div class="app-container">
 
-      <!--<stock-in-dialog-->
-        <!--ref="dialog"-->
-        <!--:propForm="propForm"-->
-        <!--:visibility="isVisibility"-->
-        <!--v-on:dialog-comfirm="comfirm"-->
-        <!--v-on:dialog-cancle="cancle"-->
-      <!--&gt;</stock-in-dialog>-->
+  
       <stock-in-dialog
         ref="dialog"
         :propForm="propForm"
@@ -69,22 +63,61 @@
                   max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
 
-          <el-table-column min-width="35" align="center">
-
+       
+          <el-table-column width="150" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>耗材名称</span>
+              </template>
+
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-autocomplete
+                      class="checkSearch"
+                      popper-class="my-autocomplete"
+                      v-model="scope.row.good_name"
+                      :fetch-suggestions="querySearchAsync"
+                      :trigger-on-focus="false"
+                      placeholder="请输入病人名字"
+                      @select="handleSelect"
+                      @input="changeGoodName(scope.$index)"
+                      style="width:150px;"
+                    >
+                      <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                      <div class="name">{{ item.good_name }}</div>
+                    </template>
+                  </el-autocomplete>
+                </el-form-item>
+              </template>
+            </el-table-column>
+           <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>耗材类型<span style="color: red">*</span></span>
             </template>
 
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
-                <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
-                          :value="typeName(scope.row.good_type_id)"
-                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+                <el-input
+                  placeholder="请输入商品类型"
+                  v-model="scope.row.good_type_id"
+                  :value="typeName(scope.row.good_type_id)"
+                ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           
-          <el-table-column min-width="35" align="center">
+             
+          <el-table-column width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格&&单位<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input v-model="scope.row.name"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
               <span>规格名称<span style="color: red">*</span></span>
             </template>
@@ -97,7 +130,7 @@
               </el-form-item>
 
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
 
           <el-table-column min-width="23" align="center">
@@ -171,13 +204,13 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID } from '@/api/stock'
+  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
   export default {
     components: { StockInDialog, BreadCrumb},
-    name: 'salesReturnEdit',
+    name: 'stockOutOrderEdit',
 
     data() {
       return {
@@ -443,6 +476,8 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
+            console.log("9999999",stockOut)
+            return
             editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -465,9 +500,12 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+            console.log("详情",response.data.data.list)
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
+              response.data.data.list[i].good_name = response.data.data.list[i].GoodInfo.good_name
+              response.data.data.list[i].name = response.data.data.list[i].GoodInfo.good_name + "*" + response.data.data.list[i].GoodInfo.specification_name
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.warehouseOut = response.data.data.info
@@ -497,7 +535,54 @@
         this.propForm.manufacturer = val
       }, changeDealer(val) {
         this.propForm.dealer = val
+      },
+       querySearchAsync(keyword, cb) {
+      let key = '';
+      if (keyword != undefined) {
+        key = keyword
       }
+      console.log("keyrowrd",key)
+      postSearchGoodList(key).then(response => {
+        if (response.data.state == 1) {
+          
+            var list = response.data.data.list
+            this.goodList = list
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
+            for(let i=0;i<this.goodList.length;i++){
+              for(let j=0;j<this.manufacturerList.length;j++){
+                if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                    this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                }
+              }
+            }
+          
+            cb(this.goodList)
+        } else {
+          cb([])
+        }
+      })
+    },
+    changeGoodName(val){
+      this.currentIndex = val
+    },
+    handleSelect(val){
+      console.log("val",val)
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].good_type_id = val.id
+            this.recordInfo.recordData[i].good_name = val.good_name
+            this.recordInfo.recordData[i].good_type_id = val.good_type_id
+            this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit +"/"+val.packing_unit
+            // this.recordInfo.recordData[i].number =  val.number
+            this.recordInfo.recordData[i].manufacturer = val.manufacturer
+            this.recordInfo.recordData[i].remark = val.remark
+            this.recordInfo.recordData[i].price = val.buy_price
+            this.recordInfo.recordData[i].specification_name = val.specification_name
+            this.recordInfo.recordData[i].good_id = val.id
+         }
+      }
+    }
     },
     created() {
       this.GetConfigInfo()