Merge branch 'superman' of http://git.shengws.com:3000/zhangbj/xt_vue into superman

config/dev.env.js

@@ -7,6 +7,4 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
-  // PATIENT_SIT: '"http://test1.sgjyun.com"',
-  // MIRCOMALL_SIT: '"http://mall.test.sgjyun.com"'
 }

src/api/signandweigh.js

@@ -1,9 +1,11 @@
 import request from '@/utils/request'
 
 export function fetchSignPatients(params) {
+  console.log("bbbbbbbbbbbbbbb")
+  console.log(params)
   return request({
     url: '/api/sign/patients',
-    method: 'get',
+    method: 'Get',
     params: params
   })
 }

src/api/stock.js

@@ -536,3 +536,11 @@ export function getCancelStockConfig(params) {
   })
 }
 
+export function getStockDetail(params) {
+  return request({
+    url: '/api/stock/detail',
+    method: 'get',
+    params: params
+  })
+}
+

src/lang/zh.js

@@ -113,7 +113,7 @@ export default {
     orderRecord: '订单详情',
     recordList: '订单记录',
     stockManage: '库存管理',
-    goodType: '物品类型',
+    goodType: '商品类型',
     stockIn: '入库管理',
     stockOut: '出库管理',
     manufacturer: '厂家',
@@ -130,7 +130,7 @@ export default {
     workforce_template: '排班模板设置',
     statistics: '统计分析',
     config: '库存配置',
-    goodInfo: '物品信息',
+    goodInfo: '商品信息',
     CourseOfDiseaseManage: '病程管理',
     RescueRecord: '抢救记录',
     special_permission_manage: '特殊权限管理',
@@ -151,7 +151,8 @@ export default {
     stockInDetail: '入库单详情',
     salesReturnDetail: '退货单详情',
     stockOutDetail: '出库单详情',
-    cancelStockDetail: '出库退库单详情'
+    cancelStockDetail: '出库退库单详情',
+    stockDetail:'出入库明细查询',
 
   },
   navbar: {

src/main.js

@@ -7,9 +7,9 @@ import 'element-ui/lib/theme-chalk/index.css'
 
 import '@/styles/index.scss' // global css
 import '@/styles/variables.scss' // global css
-import '@/assets/iconfont/iconfont.css' 
-import '@/assets/icon/iconfont.css' 
-
+import '@/assets/iconfont/iconfont.css'
+import '@/assets/icon/iconfont.css'
+import { Message } from 'element-ui'
 import App from './App'
 import router from './router'
 import store from './store'
@@ -43,4 +43,4 @@ new Vue({
   render: h => h(App)
 })
 
-Vue.prototype.Base64 = require('js-base64').Base64
+Vue.prototype.Base64 = require('js-base64').Base64

src/router/index.js

@@ -126,15 +126,15 @@ export const xt_constantRouterMap = [
   // 本地开始
   // /////////////////////////////
   {
-    path: '/sign',
+    path:'/sign',
     component: Layout,
-    redirect: '/sign/index',
-    name: 'sign',
-    alwaysShow: true,
-    meta: { title: 'signWeight', icon: 'table' },
-    children: [
-      { path: '/sign/index', component: () => import('@/xt_pages/sign/index'), name: 'signWeight', meta: { title: 'signWeight' }}
-    ]
+    redirct: '/sign/index',
+    children: [{
+      path: '/sign',
+      component:() => import('@/xt_pages/sign/index'),
+      name:'sign',
+      meta: {title:'signWeight',icon:'table',noCache:true}
+    }]
   },
   {
     path: '/qcd',
@@ -442,7 +442,13 @@ export const xt_constantRouterMap = [
         component: () => import('@/xt_pages/stock/stockQuery'),
         name: 'stockQuery',
         meta: { title: 'stockQuery' }
-      }, {
+      },{
+        path: '/stock/detail',
+        component: () => import('@/xt_pages/stock/stockDetailIndex'),
+        name: 'stockDetail',
+        meta: { title: 'stockDetail' }
+      },
+      {
         path: '/stock/in/add',
         component: () => import('@/xt_pages/stock/stockInOrderAdd'),
         name: 'stockInOrderAdd',
@@ -499,7 +505,6 @@ export const xt_constantRouterMap = [
         is_menu: false,
         meta: { title: 'cancelStockDetail' }
       }
-
     ]
   },
   {
@@ -925,7 +930,7 @@ export const xt_asyncRouterMap = [
   //   name: 'qcd',
   //   alwaysShow: true,
   //   meta: { title: '科室质控', icon: 'table' },
-  //   children: [ 
+  //   children: [
   //     { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'dialysistotal', meta: { title: 'statistics' }},
   //     { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
   //     { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},

src/xt_pages/sign/index.vue

@@ -7,7 +7,7 @@
     <div class="app-container sign-and-weigh-box">
         <el-row :gutter="20">
             <el-col :span="7">
-                <div class="title">患者列表</div>
+                <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
@@ -15,23 +15,23 @@
                     </el-select>
                 </div>
                 <el-table  :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">  
-                    <el-table-column type="index" label="序号" min-width="20" align="center"></el-table-column>
-                   <el-table-column prop="name" label="姓名" min-width="50" align="center">
+                    <el-table-column type="index" label="序号" min-width="30" align="center"></el-table-column>
+                   <el-table-column prop="name" label="姓名" min-width="30" align="center">
                        <template slot-scope="scope">
                             {{scope.row.name}}({{scope.row.dialysis_no}})
                         </template> 
                     </el-table-column> 
 
-                    <el-table-column prop="state" label="状态" min-width="30" align="center" >
+                    <el-table-column prop="state" label="状态" min-width="30" align="center">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.signin.id==0">未签到</span>
+                            <span v-if="scope.row.id==0">未签到</span>
                             <span v-else-if="scope.row.dialysis_order.stage==2">已经下机</span>
                             <span v-else>已签到</span>
                         </template>
                     </el-table-column>
                 </el-table>
             
-                <el-table  :data="schedules" style="width: 100%; margin:15px 0 0 0;" border highlight-current-row :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
+                <el-table  :data="schedules" :class="signAndWeighBoxPatients" style="width: 100%; margin:15px 0 0 0;" border highlight-current-row :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
                     <el-table-column prop="shift" label="班次" min-width="30" align="center"></el-table-column>
                     <el-table-column prop="arrange" label="排班" min-width="30" align="center" ></el-table-column>
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
@@ -44,7 +44,7 @@
             </el-col>
 
             <el-col :span="17">
-                <div class="title">患者信息</div>
+                <div class="dataTitle">患者信息</div>
                 <el-form class="information" label-position="left">
                    <div class="patient-app-container">
                      <span>姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span> <span class="button"><el-button  @click="change()">修改</el-button></span>
@@ -54,36 +54,36 @@
                     <el-row :gutter="20">
                         <el-col :span="8">
                             <el-form-item label="透前称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.weight_before"></el-input>
+                                <el-input v-model="weigh_list.weight_before" :disabled="disa" ></el-input>
                             </el-form-item>
                         </el-col> 
                         <el-col :span="8">
                             <el-form-item label="干体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.dry_weight"></el-input>
+                                <el-input v-model="weigh_list.dry_weight" :disabled="disa"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-row :gutter="20">
                         <el-col :span="4">
                             <el-form-item label="体温(℃):" label-width="80px">
-                               <el-input v-model="weigh_list.temperature"></el-input>
+                               <el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="脉搏(次/分):" label-width="90px">
-                                <el-input v-model="weigh_list.pulse_frequency"></el-input>
+                                <el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="呼吸(次/分):" label-width="100px">
-                                <el-input v-model="weigh_list.breathing_rate"></el-input>
+                                <el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="9">
                             <el-form-item label="血压(mmHg):" label-width="100px">
-                                <el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px"></el-input>
+                                <el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
                                 <span> / </span>
-                                <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px"></el-input>
+                                <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -93,36 +93,36 @@
                     <el-row :gutter="20">
                         <el-col :span="8">
                             <el-form-item label="透后称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_infor.weight_after"></el-input>
+                                <el-input v-model="weigh_infor.weight_after"  :disabled="disa"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="干体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.dry_weight"></el-input>
+                                <el-input v-model="weigh_list.dry_weight" :disabled="disa"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-row :gutter="20">
                         <el-col :span="4">
                             <el-form-item label="体温(℃):" label-width="80px">
-                                <el-input v-model="weigh_infor.temperature"></el-input>
+                                <el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="脉搏(次/分):" label-width="90px">
-                                <el-input v-model="weigh_infor.pulse_frequency"></el-input>
+                                <el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="呼吸(次/分):" label-width="100px">
-                                <el-input v-model="weigh_infor.breathing_rate"></el-input>
+                                <el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="9">
                             <el-form-item label="血压(mmHg):" label-width="100px">
-                                <el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" ></el-input>
+                                <el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
                                 <span> / </span>
-                                <el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" ></el-input>
+                                <el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -130,7 +130,7 @@
                     <div class="border"></div>
                     <div v-if="show">
                     <el-row :gutter="20">
-                        <el-col :span="23" align="right">
+                        <el-col :span="23" align="right" class="button">
                             <el-button  @click="hide()">取消</el-button>
                             <el-button @click="savedata();updatedata()" type="primary">保存</el-button>
                         </el-col>
@@ -152,7 +152,6 @@ export default {
   data() {
     return {
       crumbs: [
-          { path: false, name: '签到称重' },
           { path: '/sign/index', name: '签到称重' }
         ],
       patientlist: [],
@@ -240,12 +239,15 @@ export default {
       }],
       patients: [],
       dialysis_stege: 0,
-      show: false
+      show: false,
+      disa:true,
     }
   },
   methods: {
     fetchSignPatients() {
       fetchSignPatients(this.queryParams).then(response => {
+        console.log("weishenm")
+        console.log(this.queryParams)
         this.patients = []
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
@@ -258,6 +260,9 @@ export default {
               if (this.schedules[index].type in response.data.data.panel) {
                 this.schedules[index].arrange = response.data.data.panel[this.schedules[index].type].schedule
                 this.schedules[index].sign = response.data.data.panel[this.schedules[index].type].sign
+                console.log("签到统计")
+                console.log(response.data.data.panel)
+                console.log(this.schedules[index].sign)
                 this.schedules[index].before = response.data.data.panel[this.schedules[index].type].before
                 this.schedules[index].after = response.data.data.panel[this.schedules[index].type].after
               }
@@ -342,41 +347,43 @@ export default {
       this.dialysis_stege = row.dialysis_order.stage
       this.getDialysisInforInfomation(row.id)
       this.getDialysisAfterInfomation(row.id)
-      //   if (row.signin != null) {
-      //        this.weigh_form.dry_weight = '' + row.signin.dry_weight;
-      //        this.weigh_form.clothes_weight = '' + row.signin.clothing_weight;
-      //         // 透前
-      //         this.weigh_form.weigh_before = '' + row.signin.weighing_before;
-      //         this.weigh_form.dehydrated_weight = '' + row.signin.target_dewatering;
+        if (row.signin != null) {
+             this.weigh_form.dry_weight = '' + row.signin.dry_weight;
+             this.weigh_form.clothes_weight = '' + row.signin.clothing_weight;
+              // 透前
+              this.weigh_form.weigh_before = '' + row.signin.weighing_before;
+              this.weigh_form.dehydrated_weight = '' + row.signin.target_dewatering;
 
-      //         if (this.weigh_form.dry_weight == 0) {
-      //             this.weigh_form.dehydrated_percent  = '';
-      //         }else {
-      //             var dehydrated_percent = ((this.weigh_form.dehydrated_weight/this.weigh_form.dry_weight) * 100).toFixed(2);
-      //             if (isNaN(dehydrated_percent)) {
-      //                 this.weigh_form.dehydrated_percent  = '';
-      //             }else {
-      //                 this.weigh_form.dehydrated_percent  = dehydrated_percent + "%";
-      //             }
-      //         }
+              if (this.weigh_form.dry_weight == 0) {
+                  this.weigh_form.dehydrated_percent  = '';
+              }else {
+                  var dehydrated_percent = ((this.weigh_form.dehydrated_weight/this.weigh_form.dry_weight) * 100).toFixed(2);
+                  if (isNaN(dehydrated_percent)) {
+                      this.weigh_form.dehydrated_percent  = '';
+                  }else {
+                      this.weigh_form.dehydrated_percent  = dehydrated_percent + "%";
+                  }
+              }
 
-      //         this.weigh_form.weight_before = '' + row.signin.weight_before;
-      //         this.weigh_form.temperature_before = '' + row.signin.temperature_before;
-      //         this.weigh_form.pulse_rate_before = '' + row.signin.pulse_frequency_before;
-      //         this.weigh_form.respiratory_rate_before = '' + row.signin.breathing_rate_before;
-      //         this.weigh_form.DBP_before = '' + row.signin.diastolic_blood_pressure_before;
-      //         this.weigh_form.SBP_before = '' + row.signin.systolic_blood_pressure_before;
+              this.weigh_form.weight_before = '' + row.signin.weight_before;
+              this.weigh_form.temperature_before = '' + row.signin.temperature_before;
+              this.weigh_form.pulse_rate_before = '' + row.signin.pulse_frequency_before;
+              this.weigh_form.respiratory_rate_before = '' + row.signin.breathing_rate_before;
+              this.weigh_form.DBP_before = '' + row.signin.diastolic_blood_pressure_before;
+              this.weigh_form.SBP_before = '' + row.signin.systolic_blood_pressure_before;
 
-      //         this.weigh_form.weigh_after = '' + row.signin.weighing_after;
-      //         this.weigh_form.weight_reduce_after = '' + row.signin.weight_loss;
-      //         this.weigh_form.weight_after = '' + row.signin.weight_after;
-      //         this.weigh_form.temperature_after = '' + row.signin.temperature_after;
-      //         this.weigh_form.pulse_rate_after = '' + row.signin.pulse_frequency_after;
-      //         this.weigh_form.respiratory_rate_after = '' + row.signin.breathing_rate_after;
-      //         this.weigh_form.DBP_after = '' + row.signin.diastolic_blood_pressure_after;
-      //         this.weigh_form.SBP_after = '' + row.signin.systolic_blood_pressure_after;
-      //         this.weigh_form.id = row.signin.id;
-      //   }
+              this.weigh_form.weigh_after = '' + row.signin.weighing_after;
+              this.weigh_form.weight_reduce_after = '' + row.signin.weight_loss;
+              this.weigh_form.weight_after = '' + row.signin.weight_after;
+              this.weigh_form.temperature_after = '' + row.signin.temperature_after;
+              this.weigh_form.pulse_rate_after = '' + row.signin.pulse_frequency_after;
+              this.weigh_form.respiratory_rate_after = '' + row.signin.breathing_rate_after;
+              this.weigh_form.DBP_after = '' + row.signin.diastolic_blood_pressure_after;
+              this.weigh_form.SBP_after = '' + row.signin.systolic_blood_pressure_after;
+              this.weigh_form.id = row.id;
+              console.log("好难哦")
+              console.log(this.weigh_form.id)
+        }
     },
     submitSign() {
       SignWeigh(this.querySignParams, this.weigh_form).then(response => {
@@ -431,7 +438,7 @@ export default {
           this.weigh_list.breathing_rate = patientlist.breathing_rate
           this.weigh_list.systolic_blood_pressure = patientlist.systolic_blood_pressure
           this.weigh_list.diastolic_blood_pressure = patientlist.diastolic_blood_pressure
-          console.log('報恩 ')
+          console.log('报恩')
           console.log(patientlist)
         }
       })
@@ -455,6 +462,7 @@ export default {
     },
     change() {
       this.show = true
+      this.disa = false
     },
     savedata() {
       var params = new Object()
@@ -599,8 +607,6 @@ export default {
 }
 
  .patient-app-container {
-    margin-left: 10px;
-    padding-left: 20px;
     margin-bottom: 4px;
     height: 36px;
     line-height: 36px;

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -7,7 +7,7 @@
              label-width="116px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="物品类型" prop="good_id">
+          <el-form-item label="商品类型" prop="good_id">
             <el-select v-model="form.good_id" placeholder="请选择" size="small" >
               <el-option
                 v-for="item in form.goodType"
@@ -148,7 +148,7 @@
             { required: true, message: '请输入规格名称', trigger: 'blur' }
           ],
           good_id: [
-            { required: true, message: '请选择物品类型', trigger: 'change' }
+            { required: true, message: '请选择商品类型', trigger: 'change' }
           ]
 
         }

src/xt_pages/stock/Dialog/stockInDetailDailog.vue

@@ -20,7 +20,7 @@
           {{}}
         </template>
       </el-table-column>
-      <el-table-column label="物品批号" align="center" min-width="30">
+      <el-table-column label="商品批号" align="center" min-width="30">
         <template slot-scope="scope">
           {{}}
         </template>

src/xt_pages/stock/Dialog/stockOutDialog.vue

@@ -2,13 +2,13 @@
   <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose" width="622px">
 
-    <el-form :model="propForm.formValue" class="demo-form-inline" 
+    <el-form :model="propForm.formValue" class="demo-form-inline"
              :rules="rules" :v-model="propForm.formValue" ref="formValue"
              label-width="90px">
 
     <el-row>
       <el-col :span="12">
-        <el-form-item label="物品类型" prop="good_type_id">
+        <el-form-item label="商品类型" prop="good_type_id">
           <el-select v-model="propForm.formValue.good_type_id" placeholder="请选择" @change="goodTypeSelect"
           >
             <el-option
@@ -34,15 +34,15 @@
         </el-form-item>
       </el-col>
 
-      
+
     </el-row>
-    
-    <el-row>   
+
+    <el-row>
       <el-col :span="12">
         <el-form-item label="库存数量">
           <el-input type="number" v-model="warehouse_count" :disabled="isDisabled"></el-input>
         </el-form-item>
-      </el-col> 
+      </el-col>
       <el-col :span="12">
         <el-form-item label="出库数量" prop="count">
           <el-input type="number" v-model="propForm.formValue.count"></el-input>
@@ -57,7 +57,7 @@
         </el-form-item>
       </el-col>
     </el-row>
-    
+
     </el-form>
 
 
@@ -103,7 +103,7 @@
         isShow: true,
         rules: {
           good_id: [
-            {required: true, message: '请选择物品类型', trigger: 'change'}
+            {required: true, message: '请选择商品类型', trigger: 'change'}
           ],
           good_type_id: [
             {required: true, message: '请选择规格名称', trigger: 'change'}

src/xt_pages/stock/cancelStockOrder.vue

@@ -12,7 +12,7 @@
 
 
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -164,6 +164,7 @@
           { path: false, name: '库存管理' },
           { path: '/stock/cancel', name: '出库退库单' }
         ],
+        searchKey:'',
         type: 1,
         page: 1,
         limit: 7,
@@ -186,6 +187,28 @@
       }
     },
     methods: {
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getCancelStockList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
       AddNewOrder: function() {
         this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
       },
@@ -245,14 +268,14 @@
         this.multipleSelection = val
       }, handleSizeChange(val) {
         this.limit = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, handleCurrentChange(val) {
         this.page = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, startTimeChange(val) {
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, endTimeChange(val) {
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       }, GetConfigInfo: function() {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -61,7 +61,7 @@
             <el-table-column min-width="35" align="center">
 
               <template slot="header" slot-scope="scope">
-                <span>物品类型<span style="color: red">*</span></span>
+                <span>商品类型<span style="color: red">*</span></span>
               </template>
 
               <template slot-scope="scope" >
@@ -69,7 +69,7 @@
                 <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
 
                 <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)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
                 </el-form-item>
 
               </template>
@@ -268,7 +268,12 @@
         tempObj['return_count'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        this.recordInfo.recordData.splice(index, 1)
+        if( this.recordInfo.recordData.length <= 1){
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        }else{
+          this.recordInfo.recordData.splice(index, 1)
+        }
       }, calculate: function(val) {
         if (val == 0) {
           return ''
@@ -313,7 +318,7 @@
             let total = 0
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
+                this.$message.error('商品类型不能为空')
                 return
               }
               if (array[i].good_id == 0) {

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -31,7 +31,7 @@
       >
         <el-table-column min-width="35" align="center">
           <template slot="header" slot-scope="scope">
-            <span>物品类型</span>
+            <span>商品类型</span>
           </template>
 
           <template slot-scope="scope">
@@ -49,7 +49,7 @@
 
         <el-table-column min-width="23" align="center">
           <template slot="header" slot-scope="scope">
-            <span>退货数量</span>
+            <span>退库数量</span>
           </template>
           <template slot-scope="scope">
             <span>{{scope.row.count}}</span>

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -30,12 +30,12 @@
           <el-table-column min-width="35" align="center">
 
             <template slot="header" slot-scope="scope">
-              <span>物品类型<span style="color: red">*</span></span>
+              <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"
+                <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-form-item>
@@ -59,7 +59,7 @@
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
-              <span>退货数量<span style="color: red">*</span></span>
+              <span>退库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
@@ -242,7 +242,7 @@
           const params = {
             id: row.id
           }
-          this.$confirm('确认删除该退库物品信息记录?', '删除退库物品信息记录', {
+          this.$confirm('确认删除该退库商品信息记录?', '删除退库商品信息记录', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -293,7 +293,7 @@
             const array = this.recordInfo.recordData
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
+                this.$message.error('商品类型不能为空')
                 return
               }
               if (array[i].good_id == 0) {
@@ -341,6 +341,19 @@
             this.form.manufacturer = this.cancelStock.manufacturer
             this.form.dealer = this.cancelStock.dealer
           }
+          if( this.recordInfo.recordData.length == 0){
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['good_type_id'] = 0
+            tempObj['good_id'] = 0
+            tempObj['count'] = ''
+            this.recordInfo.recordData.push(tempObj)
+
+
+
+          }
+
+
         })
       }
     },

src/xt_pages/stock/config/dealer.vue

@@ -12,7 +12,7 @@
       <el-col>
         <!--<el-button type="primary" style="float:right;"  @click="showDialog">新增经销商</el-button>-->
 
-        <div>经销商
+        <div>
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showDialog">新增</el-button>
         </div>
 
@@ -71,7 +71,7 @@
                   @click="handleDelete(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>
-              
+
               <!--<el-button-->
                 <!--size="mini"-->
                 <!--type="primary"-->

src/xt_pages/stock/config/goodInfo.vue

@@ -13,14 +13,14 @@
       <el-col>
 
 
-        <div>物品信息
+        <div>
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showInfoDialog">新增</el-button>
         </div>
 
         <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodInfo.goodInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
                   v-loading="goodInfo.loading"
         >
-          <el-table-column label="物品编码" min-width="30" align="center">
+          <el-table-column label="商品编码" min-width="30" align="center">
             <template slot-scope="scope">
               {{scope.row.good_code}}
             </template>
@@ -63,7 +63,7 @@
                   @click="handleGoodInfoEdit(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">              
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
                 <el-button
                   size="small"
                   type="danger"
@@ -71,7 +71,7 @@
                   @click="handleGoodInfoDelete(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>
-              
+
               <!--<el-button-->
                 <!--size="mini"-->
                 <!--type="primary"-->
@@ -138,7 +138,7 @@
           editGoodId: '',
           editGoodIndex: '',
           goodInfoDialog: {
-            goodInfoTitle: '新增物品信息',
+            goodInfoTitle: '新增商品信息',
             isCreated: 1, //1.创建 2.编辑 3.查看详情
             formValue: {
               good_id: '',
@@ -227,7 +227,7 @@
       },
       handleGoodInfoDelete: function (index, row) {
 
-        this.$confirm('确认删除这条物品信息?', '删除物品信息', {
+        this.$confirm('确认删除这条商品信息?', '删除商品信息', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -244,7 +244,7 @@
               this.goodInfo.goodInfoData.splice(index, 1);
               this.$notify({
                 title: "成功",
-                message: "物品信息已经删除",
+                message: "商品信息已经删除",
                 type: "success",
                 duration: 2000
               });
@@ -389,7 +389,7 @@
               this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
             }
             if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
-              this.$message.error("请先新增物品类型");
+              this.$message.error("请先新增商品类型");
               return
             } else {
               this.goodInfo.goodInfoDialog.isVisibility = true

src/xt_pages/stock/config/goodType.vue

@@ -10,7 +10,7 @@
     <el-row :gutter="15">
       <el-col>
 
-        <div>物品类型
+        <div>
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showDialog">新增</el-button>
         </div>
 
@@ -182,7 +182,7 @@
           editInfoIndex: '',
           tableCurrentIndex: -1,
           goodTypeDialog: {
-            goodTypeTitle: '新增物品类型',
+            goodTypeTitle: '新增商品类型',
             isCreated: 1, //1.创建 2.编辑 3.查看详情
             formValue: {
               type_name: '',
@@ -217,7 +217,7 @@
       },
       handleDelete: function (index, row) {
 
-        this.$confirm('确认删除这条物品类型?', '删除物品类型', {
+        this.$confirm('确认删除这条商品类型?', '删除商品类型', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -235,7 +235,7 @@
               this.goodType.tableCurrentIndex = -1
               this.$notify({
                 title: "成功",
-                message: "物品类型已经删除",
+                message: "商品类型已经删除",
                 type: "success",
                 duration: 2000
               });
@@ -355,7 +355,7 @@
 
 
         if (this.goodType.tableCurrentIndex == -1) {
-          this.$message.error("请先选择物品类型");
+          this.$message.error("请先选择商品类型");
           return
         } else {
           this.getAllGoodType()

src/xt_pages/stock/config/manufacturer.vue

@@ -11,7 +11,7 @@
     <el-row>
       <el-col>
 
-        <div>厂家
+        <div>
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showDialog">新增</el-button>
         </div>
 
@@ -59,7 +59,7 @@
                   @click="handleEdit(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">              
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
                 <el-button
                   size="small"
                   type="danger"

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -0,0 +1,453 @@
+<template>
+  <div class="main-contain">
+    <div class="app-container">
+      <div class="cell clearfix" >
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">单据类型</span> : </label>
+        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+          <el-option
+            v-for="item in orderTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">其它</span> : </label>
+        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.order_number}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.CancelStock.return_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.CancelStock.creater)}}
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="数量" align="center">
+            <template slot-scope="scope">
+              {{scope.row.count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+
+
+  export default {
+    name: 'cancelStockDetail',
+
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        orderTypeArr: [
+          { value: 1, label: '耗材入库单' },
+          { value: 2, label: '其他入库单' }
+        ],
+        manufacturer_id: '',
+        dealer_id: '',
+        order_type: '',
+        searchKey:'',
+        type: 4,
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      changeType: function(val) {
+        this.order_type  = val
+        this.GetCancelStock()
+      }, changeManufacturer: function(val) {
+        this.manufacturer_id  = val
+        this.GetCancelStock()
+      },
+      getTypeName:function(row){
+        let name = ""
+        let name2 = ""
+        if (row.type == 1){
+          name = "耗材退库单"
+
+        }else if(row.type == 2){
+          name = "其他退库单"
+        }
+
+        return name
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          manufacturer: this.manufacturer_id,
+          order_type: this.order_type,
+          dealer: this.dealer_id
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetCancelStock()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetCancelStock()
+      }, startTimeChange(val) {
+        this.GetCancelStock()
+      }, endTimeChange(val) {
+        this.GetCancelStock()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -0,0 +1,456 @@
+<template>
+  <div class="main-contain">
+    <div class="app-container">
+      <div class="cell clearfix" >
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">单据类型</span> : </label>
+        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+          <el-option
+            v-for="item in orderTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">其它</span> : </label>
+        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+
+
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.order_number}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.SalesReturn.return_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.SalesReturn.creater)}}
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="数量" align="center">
+            <template slot-scope="scope">
+              {{scope.row.count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+
+
+  export default {
+    name: 'salesReturnDetail',
+
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        orderTypeArr: [
+          { value: 1, label: '耗材入库单' },
+          { value: 2, label: '其他入库单' }
+        ],
+        manufacturer_id: '',
+        dealer_id: '',
+        order_type: '',
+        searchKey:'',
+        type: 3,
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      changeType: function(val) {
+        this.order_type  = val
+        this.GetCancelStock()
+      }, changeManufacturer: function(val) {
+        this.manufacturer_id  = val
+        this.GetCancelStock()
+
+      },
+      getTypeName:function(row){
+        let name = ""
+        if (row.type == 1){
+          name = "耗材退货单"
+
+        }else if(row.type == 2){
+          name = "其他退货单"
+        }
+
+        return name
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          manufacturer: this.manufacturer_id,
+          order_type: this.order_type,
+          dealer: this.dealer_id
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetCancelStock()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetCancelStock()
+      }, startTimeChange(val) {
+        this.GetCancelStock()
+      }, endTimeChange(val) {
+        this.GetCancelStock()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -0,0 +1,465 @@
+<template>
+  <div class="main-contain">
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">单据类型</span> : </label>
+        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+          <el-option
+            v-for="item in orderTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">其它</span> : </label>
+        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehousing_order}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.Warehousing.warehousing_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.Warehousing.creater)}}
+
+            </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">
+              {{scope.row.warehousing_count}}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.price * scope.row.warehousing_count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+
+  export default {
+    name: 'stockInDetail',
+
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        orderTypeArr: [
+          { value: 1, label: '耗材入库单' },
+          { value: 2, label: '其他入库单' }
+        ],
+
+        searchKey: '',
+        type: 1,
+        page: 1,
+        limit: 7,
+        manufacturer_id: '',
+        dealer_id: '',
+        order_type: '',
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      changeType: function(val) {
+        this.order_type  = val
+        this.GetCancelStock()
+      }, changeManufacturer: function(val) {
+        this.manufacturer_id  = val
+        this.GetCancelStock()
+
+      }, changeDealer: function(val) {
+        this.dealer_id  = val
+        this.GetCancelStock()
+
+      }, getTypeName: function(row) {
+        let name = ''
+        if (row.type == 1) {
+          name = '耗材入库单'
+
+        } else if (row.type == 2) {
+          name = '其他入库单'
+        }
+
+        return name
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords: this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type } })
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          manufacturer: this.manufacturer_id,
+          order_type: this.order_type,
+          dealer: this.dealer_id
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetCancelStock()
+      }, endTimeChange(val) {
+        this.GetCancelStock()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type } })
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -0,0 +1,468 @@
+<template>
+  <div class="main-contain">
+    <div class="app-container">
+      <div class="cell clearfix" >
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">单据类型</span> : </label>
+        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+          <el-option
+            v-for="item in orderTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">其它</span> : </label>
+        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+
+
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehouse_out_order_number}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.WarehouseOut.warehouse_out_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.WarehouseOut.creater)}}
+
+            </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">
+              {{scope.row.count}}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.price *  scope.row.count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+
+
+  export default {
+    name: 'stockOutDetail',
+
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        orderTypeArr: [
+          { value: 1, label: '耗材入库单' },
+          { value: 2, label: '其他入库单' }
+        ],
+        manufacturer_id: '',
+        dealer_id: '',
+        order_type: '',
+
+        searchKey:'',
+        type: 2,
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      changeType: function(val) {
+        this.order_type  = val
+        this.GetCancelStock()
+      }, changeManufacturer: function(val) {
+        this.manufacturer_id  = val
+        this.GetCancelStock()
+
+      },
+      getTypeName:function(row){
+        let name = ""
+        let name2 = ""
+        if (row.type == 1){
+          name = "耗材出库单"
+
+        }else if(row.type == 2){
+          name = "其他出库单"
+        }
+
+        return name
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          manufacturer: this.manufacturer_id,
+          order_type: this.order_type,
+          dealer: this.dealer_id
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetCancelStock()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetCancelStock()
+      }, startTimeChange(val) {
+        this.GetCancelStock()
+      }, endTimeChange(val) {
+        this.GetCancelStock()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/index.vue

@@ -12,10 +12,10 @@
         <el-tab-pane label="经销商" >
           <dealer></dealer>
         </el-tab-pane>
-        <el-tab-pane label="物品类型" >
+        <el-tab-pane label="商品类型" >
           <good-type></good-type>
         </el-tab-pane>
-        <el-tab-pane label="物品信息" >
+        <el-tab-pane label="商品信息" >
           <good-info></good-info>
         </el-tab-pane>
 

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -11,7 +11,7 @@
     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -163,6 +163,7 @@
           { path: false, name: '库存管理' },
           { path: '/stock/cancel', name: '其他出库退库单' }
         ],
+        searchKey:'',
         type: 2,
         page: 1,
         limit: 7,
@@ -185,6 +186,28 @@
       }
     },
     methods: {
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getCancelStockList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
       AddNewOrder: function() {
         this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
       },
@@ -244,14 +267,14 @@
         this.multipleSelection = val
       }, handleSizeChange(val) {
         this.limit = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, handleCurrentChange(val) {
         this.page = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, startTimeChange(val) {
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, endTimeChange(val) {
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       }, GetConfigInfo: function() {

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -11,7 +11,7 @@
     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -169,6 +169,7 @@
     },
     data() {
       return {
+        searchKey:'',
         crumbs: [
           { path: false, name: '库存管理' },
           { path: '/stock/return', name: '其他退货单' }
@@ -195,6 +196,28 @@
       }
     },
     methods: {
+      search:function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords: this.searchKey,
+        }
+        this.saleReturnDate = []
+        getSalesReturnList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.saleReturnDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
       AddNewOrder: function() {
         this.$router.push({ name: 'salesReturnOrderAdd', query: { type: this.type }})
       },
@@ -254,14 +277,14 @@
         this.multipleSelection = val
       }, handleSizeChange(val) {
         this.limit = val
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, handleCurrentChange(val) {
         this.page = val
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, startTimeChange(val) {
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, endTimeChange(val) {
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       }, GetConfigInfo: function() {

src/xt_pages/stock/otherStockInOrder.vue

@@ -10,8 +10,8 @@
     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button class="filter-item"  type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
@@ -163,6 +163,7 @@
     },
     data() {
       return {
+        searchKey:'',
         crumbs: [
           { path: false, name: '库存管理' },
           { path: '/stock/in/other', name: '其他入库单' }
@@ -197,7 +198,32 @@
       }
     },
     methods: {
-      GetWarehouse: function() {
+      search:function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords: this.searchKey,
+        }
+        this.Warehouse.warehouseDate = []
+        getWarehouseList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.Warehouse.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Warehouse.loading = false
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.Warehouse.warehouseDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+
+        GetWarehouse: function() {
         const Params = {
           page: this.page,
           limit: this.limit,
@@ -327,7 +353,7 @@
       }, handleReturnSales: function() {
         // this.$router.push({path:'/patients/create'}
         if (this.multipleSelection.length <= 0) {
-          this.$message.error('请选择退货物品')
+          this.$message.error('请选择退货商品')
           return
         }
 

src/xt_pages/stock/otherStockOutOrder.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -165,6 +165,7 @@ export default {
         { path: false, name: "库存管理" },
         { path: "/stock/out", name: "其他出库单" }
       ],
+      searchKey:'',
       page: 1,
       limit: 7,
       checked: false,
@@ -186,6 +187,29 @@ export default {
     };
   },
   methods: {
+    search:function(){
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords:this.searchKey,
+      }
+      this.warehouseOutDate = [];
+      getWarehouseOutList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehouseOutDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+
+    },
     AddNewOrder: function() {
       this.$router.push({
         name: "stockOutOrderAdd",
@@ -255,17 +279,17 @@ export default {
     },
     handleSizeChange(val) {
       this.limit = val;
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     handleCurrentChange(val) {
       this.page = val;
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     startTimeChange(val) {
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     endTimeChange(val) {
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/salesReturnEdit.vue

@@ -32,12 +32,12 @@
             <el-table-column min-width="35" align="center">
 
               <template slot="header" slot-scope="scope">
-                <span>物品类型<span style="color: red">*</span></span>
+                <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"
+                  <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-form-item>
@@ -254,7 +254,7 @@
           const params = {
             id: row.id
           }
-          this.$confirm('确认删除该退货物品信息记录?', '删除退货物品信息记录', {
+          this.$confirm('确认删除该退货商品信息记录?', '删除退货商品信息记录', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -305,7 +305,7 @@
             const array = this.recordInfo.recordData
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
+                this.$message.error('商品类型不能为空')
                 return
               }
               if (array[i].good_id == 0) {
@@ -353,6 +353,17 @@
             this.form.manufacturer = this.salesReturn.manufacturer
             this.form.dealer = this.salesReturn.dealer
           }
+
+
+          if( this.recordInfo.recordData.length == 0){
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['good_type_id'] = 0
+            tempObj['good_id'] = 0
+            tempObj['count'] = ''
+            this.recordInfo.recordData.push(tempObj)
+          }
+
         })
       }
     },

src/xt_pages/stock/salesReturnOrder.vue

@@ -11,7 +11,7 @@
     <div class="app-container">
 
       <div class="cell clearfix" >
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -164,6 +164,7 @@
     },
     data() {
       return {
+        searchKey:'',
         crumbs: [
           { path: false, name: '库存管理' },
           { path: '/stock/return', name: '退货单' }
@@ -190,6 +191,28 @@
       }
     },
     methods: {
+      search:function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords: this.searchKey,
+        }
+        this.saleReturnDate = []
+        getSalesReturnList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.saleReturnDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
       AddNewOrder: function() {
         this.$router.push({ name: 'salesReturnOrderAdd', query: { type: this.type }})
       },
@@ -249,14 +272,14 @@
         this.multipleSelection = val
       }, handleSizeChange(val) {
         this.limit = val
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, handleCurrentChange(val) {
         this.page = val
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, startTimeChange(val) {
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, endTimeChange(val) {
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       }, GetConfigInfo: function() {

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -54,7 +54,7 @@
           <el-table-column min-width="35" align="center">
 
             <template slot="header" slot-scope="scope">
-              <span>物品类型<span style="color: red">*</span></span>
+              <span>商品类型<span style="color: red">*</span></span>
             </template>
 
             <template slot-scope="scope">
@@ -62,7 +62,7 @@
               <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
 
               <el-form-item style="padding-top: 15px">
-                <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                <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-form-item>
@@ -278,7 +278,13 @@
         tempObj['price'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        this.recordInfo.recordData.splice(index, 1)
+        if( this.recordInfo.recordData.length <= 1){
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        }else{
+          this.recordInfo.recordData.splice(index, 1)
+        }
+
       }, calculate: function(val) {
         if (val == 0) {
           return ''
@@ -323,7 +329,7 @@
             let total = 0
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
+                this.$message.error('商品类型不能为空')
                 return
               }
               if (array[i].good_id == 0) {

src/xt_pages/stock/salesReturnOrderDetail.vue

@@ -31,7 +31,7 @@
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>物品类型</span>
+              <span>商品类型</span>
             </template>
 
             <template slot-scope="scope">

src/xt_pages/stock/stockDetail.vue

@@ -0,0 +1,451 @@
+<template>
+
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button size="small" @click="AddNewOrder" class="filter-item" style="float:right;" type="primary"
+                 icon="el-icon-circle-plus-outline">新增
+      </el-button>
+    </div>
+
+    <div class="app-container">
+
+
+      <div class="cell clearfix" >
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+      <div class="filter-container" style="margin-top: 10px">
+        <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+
+
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehousing_order}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.warehousing_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.creater)}}
+
+            </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">
+              {{scope.row.warehousing_count}}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.price *  scope.row.warehousing_count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
+
+  export default {
+    name: 'salesReturnOrder',
+    components: { BreadCrumb },
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/detail', name: '出入库明细查询' }
+        ],
+        searchKey:'',
+        type: 1,
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      getTypeName:function(row){
+        let name = ""
+        let name2 = ""
+        if (row.type == 1){
+          name = "耗材"
+
+        }else if(row.type == 2){
+          name = "其他"
+        }
+        if (row.types == 1){
+          name2 = "入库单"
+        }else if(row.types == 2){
+          name2 = "出库单"
+        }else if(row.types == 3){
+          name2 = "退货单"
+        }else if(row.types == 4){
+          name2 = "退库单"
+        }
+        return name + name2
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetWarehouse()
+      }, endTimeChange(val) {
+        this.GetWarehouse()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/stockDetailIndex.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="service-box">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="入库明细" name="first">
+            <stock-in-detail></stock-in-detail>
+          </el-tab-pane>
+          <el-tab-pane label="退货明细">
+            <sales-return-detail></sales-return-detail>
+
+          </el-tab-pane>
+          <el-tab-pane label="出库明细">
+            <stock-out-detail></stock-out-detail>
+
+          </el-tab-pane>
+          <el-tab-pane label="退库明细">
+           <cancel-stock-detail></cancel-stock-detail>
+          </el-tab-pane>
+
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import StockInDetail from './detail/stockInDetail'
+  import StockOutDetail from './detail/stockOutDetail'
+  import SalesReturnDetail from './detail/salesReturnDetail'
+  import CancelStockDetail from './detail/cancelStockDetail'
+
+  export default {
+    name: 'stockDetailIndex',
+    components: {
+      CancelStockDetail,
+      SalesReturnDetail,
+      StockOutDetail,
+      StockInDetail,
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/detail', name: '出入库明细查询' }
+        ],
+        activeName: 'first'
+      }
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event, this.activeName)
+      }
+    }
+  }
+</script>
+
+

src/xt_pages/stock/stockInOrder.vue

@@ -9,7 +9,7 @@
 
     <div class="app-container">
     <div class="cell clearfix">
-      <el-input   style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据日期/单据编码/制单人/供应商" />
+      <el-input   style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据编码/制单人/厂商" />
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
     </div>
 
@@ -162,10 +162,12 @@
     },
     data() {
       return {
+
         crumbs: [
           { path: false, name: '库存管理' },
           { path: '/stock/in', name: '入库单' }
         ],
+        searchKey:'',
         type: 1,
         page: 1,
         limit: 7,
@@ -196,6 +198,31 @@
       }
     },
     methods: {
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.Warehouse.warehouseDate = []
+        getWarehouseList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.Warehouse.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Warehouse.loading = false
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.Warehouse.warehouseDate.push(response.data.data.list[i])
+            }
+          }
+        })
+
+      },
       GetWarehouse: function() {
         const Params = {
           page: this.page,
@@ -326,7 +353,7 @@
       }, handleReturnSales: function() {
         // this.$router.push({path:'/patients/create'}
         if (this.multipleSelection.length <= 0) {
-          this.$message.error('请选择退货物品')
+          this.$message.error('请选择退货商品')
           return
         }
 

src/xt_pages/stock/stockInOrderAdd.vue

@@ -54,12 +54,12 @@
                 <el-table-column  align="center" width="200">
 
                   <template slot="header" slot-scope="scope">
-                    <span>物品类型<span style="color: red">*</span></span>
+                    <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"
+                      <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-form-item>
@@ -428,7 +428,12 @@
         tempObj['manufacturer'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        this.recordInfo.recordData.splice(index, 1)
+        if( this.recordInfo.recordData.length <= 1){
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        }else{
+          this.recordInfo.recordData.splice(index, 1)
+        }
       }, calculate: function(val) {
         if (val == 0) {
           return ''
@@ -521,7 +526,7 @@
             const array = this.recordInfo.recordData
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
+                this.$message.error('商品类型不能为空')
                 return
               }
               if (array[i].good_id == 0) {

src/xt_pages/stock/stockInOrderDetail.vue

@@ -5,7 +5,7 @@
     </div>
   <div class="app-container">
     <div class="filter-container">
-      <span style="font-size: 18px">耗材入库单详情</span>
+      <span style="font-size: 18px">入库单详情</span>
       <el-row style="float:right;">
         <span>入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
       </el-row>
@@ -28,7 +28,7 @@
       >
         <el-table-column min-width="35" align="center">
           <template slot="header" slot-scope="scope">
-            <span>物品类型</span>
+            <span>商品类型</span>
           </template>
 
           <template slot-scope="scope">

src/xt_pages/stock/stockInOrderEdit.vue

@@ -31,12 +31,12 @@
             <el-table-column  align="center" width="200" >
 
               <template slot="header" slot-scope="scope">
-                <span>物品类型<span style="color: red">*</span></span>
+                <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"
+                  <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-form-item>
@@ -131,7 +131,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" fixed="right" align="center" width="150">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -257,6 +257,7 @@ export default {
       }
   },
     methods: {
+
       comfirm: function(val) {
         this.isVisibility = false
         if (val.selectedGoodInfo.length > 0) {
@@ -334,7 +335,7 @@ export default {
           const params = {
             id: row.id
           }
-          this.$confirm('确认删除该入库物品信息记录?', '删除入库物品信息记录', {
+          this.$confirm('确认删除该入库商品信息记录?', '删除入库商品信息记录', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -407,7 +408,7 @@ export default {
             const array = this.recordInfo.recordData
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
+                this.$message.error('商品类型不能为空')
                 return
               }
               if (array[i].good_id == 0) {
@@ -459,6 +460,22 @@ export default {
             this.form.manufacturer = this.warehouse.manufacturer
             this.form.dealer = this.warehouse.dealer
             this.warehousing_time = this.getTime(this.warehouse.warehousing_time, '{y}-{m}-{d}')
+
+            if(this.recordInfo.recordData.length == 0){
+              const tempObj = {}
+              tempObj['id'] = 0
+              tempObj['good_type_id'] = 0
+              tempObj['good_id'] = 0
+              tempObj['number'] = ''
+              tempObj['product_date'] = ''
+              tempObj['expiry_date'] = ''
+              tempObj['warehousing_count'] = ''
+              tempObj['price'] = ''
+              tempObj['remark'] = ''
+              tempObj['dealer'] = ''
+              tempObj['manufacturer'] = ''
+              this.recordInfo.recordData.push(tempObj)
+            }
           }
         })
       }

src/xt_pages/stock/stockOutOrder.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -160,6 +160,7 @@ export default {
   },
   data() {
     return {
+      searchKey:"",
       crumbs: [
         { path: false, name: "库存管理" },
         { path: "/stock/out", name: "出库单" }
@@ -185,6 +186,29 @@ export default {
     };
   },
   methods: {
+    search:function(){
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords:this.searchKey,
+      }
+      this.warehouseOutDate = [];
+      getWarehouseOutList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehouseOutDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+
+    },
     AddNewOrder: function() {
       this.$router.push({
         name: "stockOutOrderAdd",
@@ -254,17 +278,17 @@ export default {
     },
     handleSizeChange(val) {
       this.limit = val;
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     handleCurrentChange(val) {
       this.page = val;
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     startTimeChange(val) {
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     endTimeChange(val) {
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -57,7 +57,7 @@
             <el-table-column min-width="35" align="center">
 
               <template slot="header" slot-scope="scope">
-                <span>物品类型<span style="color: red">*</span></span>
+                <span>商品类型<span style="color: red">*</span></span>
               </template>
 
               <template slot-scope="scope" >
@@ -65,7 +65,7 @@
                 <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
 
                 <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)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
                 </el-form-item>
 
               </template>
@@ -300,7 +300,12 @@
 
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        this.recordInfo.recordData.splice(index, 1)
+        if( this.recordInfo.recordData.length <= 1){
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        }else{
+          this.recordInfo.recordData.splice(index, 1)
+        }
       }, calculate: function(val) {
         if (isNaN(val)) {
           return ''
@@ -347,7 +352,7 @@
             let total = 0
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
+                this.$message.error('商品类型不能为空')
                 return
               }
               if (array[i].good_id == 0) {

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -31,7 +31,7 @@
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>物品类型</span>
+              <span>商品类型</span>
             </template>
 
             <template slot-scope="scope">

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -30,12 +30,12 @@
             <el-table-column min-width="35" align="center">
 
               <template slot="header" slot-scope="scope">
-                <span>物品类型<span style="color: red">*</span></span>
+                <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"
+                  <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-form-item>
@@ -274,7 +274,7 @@
           const params = {
             id: row.id
           }
-          this.$confirm('确认删除该退货物品信息记录?', '删除退货物品信息记录', {
+          this.$confirm('确认删除该退货商品信息记录?', '删除退货商品信息记录', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -325,7 +325,7 @@
             const array = this.recordInfo.recordData
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
-                this.$message.error('物品类型不能为空')
+                this.$message.error('商品类型不能为空')
                 return
               }
               if (array[i].good_id == 0) {
@@ -372,6 +372,19 @@
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
           }
+
+          if( this.recordInfo.recordData.length == 0){
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['good_type_id'] = 0
+            tempObj['good_id'] = 0
+            tempObj['count'] = ''
+            tempObj['price'] = ''
+            tempObj['remark'] = ''
+            this.recordInfo.recordData.push(tempObj)
+          }
+
+
         })
       }, calculate: function(val) {
         if (val == 0) {

src/xt_pages/stock/stockQuery.vue

@@ -9,7 +9,7 @@
                 v-loading="WarehouseInfo.loading"
       >
 
-        <el-table-column label="物品编码" align="center">
+        <el-table-column label="商品编码" align="center">
           <template slot-scope="scope">
             {{scope.row.good_code}}
           </template>

src/xt_pages/user/components/PatientForm.vue

@@ -60,7 +60,11 @@
               <el-col :span="8" >
                 <el-form-item label="透析号 : " class="is-required" prop="dialysisNo" >
                     <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input> 
+<<<<<<< .mine
+                    <el-button style="width:36%;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>   
+=======
                     <el-button style="width:36%;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>
+>>>>>>> .theirs
                 </el-form-item>
               </el-col>
             </template>

src/xt_pages/workforce/template.vue

@@ -1,142 +1,151 @@
 <template>
-<div class="main-contain">
+  <div class="main-contain">
     <div class="position">
-        <bread-crumb></bread-crumb>
-        <!-- <el-col :span="3" style="text-align: right;"> -->
-        <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
-        <!-- </el-col> -->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+
+      <!-- <el-col :span="3" style="text-align: right;"> -->
+      <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
+      <!-- </el-col> -->
     </div>
     <div class="app-container">
-        <!-- <el-row>
-            <el-col :span="21"> -->
-                <el-tabs v-model="activeName" tab-position="top" >
-                    <el-tab-pane name="schedules">
-                        <span slot="label"> 排班信息 </span>
-                        <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules" :patients="patients"></template-table>
-                    </el-tab-pane>
-                    <el-tab-pane name="first" :disabled="template_mode.mode == 0">
-                        <span slot="label"> 第一周 </span>
-                        <template-table :editable="true" :device_numbers="device_numbers" :template="first_template" :patients="patients"></template-table>
-                    </el-tab-pane>
-                    <el-tab-pane name="second" :disabled="template_mode.mode != 2">
-                        <span slot="label"> 第二周 </span>
-                        <template-table :editable="true" :device_numbers="device_numbers" :template="second_template" :patients="patients"></template-table>
-                    </el-tab-pane>
-                </el-tabs>
-            <!-- </el-col> -->
-            
-        <!-- </el-row> -->
+      <!-- <el-row>
+          <el-col :span="21"> -->
+      <el-tabs v-model="activeName" tab-position="top">
+        <el-tab-pane name="schedules">
+          <span slot="label"> 排班信息 </span>
+          <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules"
+                          :patients="patients"></template-table>
+        </el-tab-pane>
+        <el-tab-pane name="first" :disabled="template_mode.mode == 0">
+          <span slot="label"> 第一周 </span>
+          <template-table :editable="true" :device_numbers="device_numbers" :template="first_template"
+                          :patients="patients"></template-table>
+        </el-tab-pane>
+        <el-tab-pane name="second" :disabled="template_mode.mode != 2">
+          <span slot="label"> 第二周 </span>
+          <template-table :editable="true" :device_numbers="device_numbers" :template="second_template"
+                          :patients="patients"></template-table>
+        </el-tab-pane>
+      </el-tabs>
+      <!-- </el-col> -->
+
+      <!-- </el-row> -->
 
-        <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode" @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
+      <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode"
+                              @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
     </div>
- </div>
+  </div>
 </template>
 
 <script>
-import SetUpTemplateDialog from "./components/setup_template_dialog"
-import TemplateTable from "./components/template_table"
-import { getTemplateInitData } from "@/api/schedule_template/patient"
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import SetUpTemplateDialog from './components/setup_template_dialog'
+  import TemplateTable from './components/template_table'
+  import { getTemplateInitData } from '@/api/schedule_template/patient'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
 
-export default {
-    name: "WorkforceTemplate",
+  export default {
+    name: 'WorkforceTemplate',
     components: {
-        SetUpTemplateDialog,
-        TemplateTable,
-        BreadCrumb
+      SetUpTemplateDialog,
+      TemplateTable,
+      BreadCrumb
     },
     data: function() {
-        return {
-            activeName: "schedules",
-            template_mode: {
-                id: 0,
-                mode: 0,
-            },
-            origin_mode: 0,
-            device_numbers: [],
-            patients: [],
+      return {
+        crumbs: [
+          { path: false, name: '排班管理' },
+          { path: 'workforce/template', name: '排班模版' }
+        ],
+        activeName: 'schedules',
+        template_mode: {
+          id: 0,
+          mode: 0
+        },
+        origin_mode: 0,
+        device_numbers: [],
+        patients: [],
 
-            first_template: {
-                items: [],
-            },
-            second_template: {
-                items: [],
-            },
-            this_week_schedules: {
-                id: 0,
-                items: [],
-            }
+        first_template: {
+          items: []
+        },
+        second_template: {
+          items: []
+        },
+        this_week_schedules: {
+          id: 0,
+          items: []
         }
+      }
     },
     created() {
-        getTemplateInitData().then(rs => {
-            var resp = rs.data
-            if (resp.state == 1) {
-                var mode = resp.data.template_mode
-                var device_numbers = resp.data.device_numbers
-                var templates = resp.data.templates
-                var patients = resp.data.patients
-                var schedules = resp.data.schedules
+      getTemplateInitData().then(rs => {
+        var resp = rs.data
+        if (resp.state == 1) {
+          var mode = resp.data.template_mode
+          var device_numbers = resp.data.device_numbers
+          var templates = resp.data.templates
+          var patients = resp.data.patients
+          var schedules = resp.data.schedules
 
-                this.template_mode = mode
-                this.origin_mode = mode.mode
-                this.device_numbers = device_numbers,
-                this.patients = patients
+          this.template_mode = mode
+          this.origin_mode = mode.mode
+          this.device_numbers = device_numbers,
+            this.patients = patients
 
-                this.first_template = templates[0]
-                this.second_template = templates[1]
+          this.first_template = templates[0]
+          this.second_template = templates[1]
 
-                var fakeTemplateItems = []
-                for (let index = 0; index < schedules.length; index++) {
-                    const schedule = schedules[index];
-                    var item = {}
-                    this.$set(item, "id", schedule.id)
-                    this.$set(item, "template_id", 0)
-                    this.$set(item, "device_number_id", schedule.bed_id)
-                    this.$set(item, "treat_mode", schedule.mode_id)
-                    this.$set(item, "weekday", schedule.schedule_week)
-                    this.$set(item, "time_type", schedule.schedule_type)
-                    var patient = {}
-                    this.$set(patient, "id", schedule.patient_id)
-                    this.$set(patient, "name", schedule.patient)
-                    this.$set(item, "patient", patient)
+          var fakeTemplateItems = []
+          for (let index = 0; index < schedules.length; index++) {
+            const schedule = schedules[index]
+            var item = {}
+            this.$set(item, 'id', schedule.id)
+            this.$set(item, 'template_id', 0)
+            this.$set(item, 'device_number_id', schedule.bed_id)
+            this.$set(item, 'treat_mode', schedule.mode_id)
+            this.$set(item, 'weekday', schedule.schedule_week)
+            this.$set(item, 'time_type', schedule.schedule_type)
+            var patient = {}
+            this.$set(patient, 'id', schedule.patient_id)
+            this.$set(patient, 'name', schedule.patient)
+            this.$set(item, 'patient', patient)
 
-                    fakeTemplateItems.push(item)
-                }
-                this.this_week_schedules.items = fakeTemplateItems
+            fakeTemplateItems.push(item)
+          }
+          this.this_week_schedules.items = fakeTemplateItems
 
-            } else {
-                this.$message(resp.msg)
-            }
-        })
+        } else {
+          this.$message(resp.msg)
+        }
+      })
     },
     methods: {
-        setScheduleTemplateAction: function() {
-            this.$refs.setup_dialog.show()
-        },
-        didChangeTemplateMode: function(mode) {
-            if (this.origin_mode != mode) {
-                if (this.origin_mode == 0) { // 0 -> 1 或 0 -> 2
-                    // 不处理模板 item
-                } else if (mode == 0) { // 1 -> 0 或 2 -> 0 清除所有模板的 item
-                    this.first_template.items.splice(0, this.first_template.items.length)
-                    this.second_template.items.splice(0, this.second_template.items.length)
-                    if (this.activeName != "schedules") {
-                        this.activeName = "schedules"
-                    }
-                } else if (this.origin_mode == 1 && mode == 2) { // 1 -> 2
-                    // 不处理模板 item
-                } else if (this.origin_mode == 2 && mode == 1) { // 2 -> 1 清除第二个模板的 item
-                    this.second_template.items.splice(0, this.second_template.items.length)
-                    if (this.activeName == "second") {
-                        this.activeName = "schedules"
-                    }
-                }
-                this.origin_mode = mode
+      setScheduleTemplateAction: function() {
+        this.$refs.setup_dialog.show()
+      },
+      didChangeTemplateMode: function(mode) {
+        if (this.origin_mode != mode) {
+          if (this.origin_mode == 0) { // 0 -> 1 或 0 -> 2
+            // 不处理模板 item
+          } else if (mode == 0) { // 1 -> 0 或 2 -> 0 清除所有模板的 item
+            this.first_template.items.splice(0, this.first_template.items.length)
+            this.second_template.items.splice(0, this.second_template.items.length)
+            if (this.activeName != 'schedules') {
+              this.activeName = 'schedules'
+            }
+          } else if (this.origin_mode == 1 && mode == 2) { // 1 -> 2
+            // 不处理模板 item
+          } else if (this.origin_mode == 2 && mode == 1) { // 2 -> 1 清除第二个模板的 item
+            this.second_template.items.splice(0, this.second_template.items.length)
+            if (this.activeName == 'second') {
+              this.activeName = 'schedules'
             }
+          }
+          this.origin_mode = mode
         }
+      }
     }
-}
+  }
 </script>
 
 <style scoped>