修改华侨医院bug

src/api/stock.js

@@ -544,3 +544,12 @@ export function getStockDetail(params) {
   })
 }
 
+
+
+export function getPrintStockGood(params) {
+  return request({
+    url: '/api/print/stock',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/stock.js

@@ -11,119 +11,128 @@ export default {
     icon: 'stock'
   },
   children: [
-        {
-          path: '/stock/in',
-          component: () => import('@/xt_pages/stock/stockInOrder'),
-          name: 'stockInOrder',
-          meta: { title: 'stockInOrder', noCache: true }
-        }, {
-          path: '/stock/return',
-          component: () => import('@/xt_pages/stock/salesReturnOrder'),
-          name: 'salesReturnOrder',
-          meta: { title: 'salesReturnOrder', noCache: true }
-        }, 
-        {
-          path: '/stock/out',
-          component: () => import('@/xt_pages/stock/stockOutOrder'),
-          name: 'stockOutOrder',
-          meta: { title: 'stockOutOrder', noCache: true }
-        },  {
-          path: '/stock/cancel',
-          component: () => import('@/xt_pages/stock/cancelStockOrder'),
-          name: 'cancelStockOrder',
-          meta: { title: 'cancelStockOrder', noCache: true }
-        },{
-          path: '/stock/in/other',
-          component: () => import('@/xt_pages/stock/otherStockInOrder'),
-          name: 'otherStockInOrder',
-          meta: { title: 'otherStockInOrder', noCache: true }
-        }, {
-          path: '/stock/return/other',
-          component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
-          name: 'otherSalesReturnOrder',
-          meta: { title: 'otherSalesReturnOrder', noCache: true }
-        },{
-          path: '/stock/out/other',
-          component: () => import('@/xt_pages/stock/otherStockOutOrder'),
-          name: 'otherStockOutOrder',
-          meta: { title: 'otherStockOutOrder', noCache: true }
-        }, {
-          path: '/stock/cancel/other',
-          component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
-          name: 'otherCancelStockOrder',
-          meta: { title: 'otherCancelStockOrder', noCache: true }
-        }, {
-          path: '/stock/query',
-          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',
-          hidden: true,
-          is_menu: false,
-          meta: { title: 'stockInOrderAdd' }
-        }, {
-          path: '/stock/in/detail',
-          component: () => import('@/xt_pages/stock/stockInDetail'),
-          name: 'stockInDetail',
-          hidden: true,
-          is_menu: false,
-          meta: { title: 'stockInDetail' }
-        }, {
-          path: '/stock/return/detail',
-          component: () => import('@/xt_pages/stock/salesReturnDetail'),
-          name: 'salesReturnDetail',
-          hidden: true,
-          is_menu: false,
-          meta: { title: 'salesReturnDetail' }
-        }, {
-          path: '/stock/return/add',
-          component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
-          name: 'salesReturnOrderAdd',
-          hidden: true,
-          is_menu: false,
-          meta: { title: 'salesReturnOrderAdd' }
-        }, {
-          path: '/stock/out/add',
-          component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
-          name: 'stockOutOrderAdd',
-          hidden: true,
-          is_menu: false,
-          meta: { title: 'stockOutOrderAdd', noCache: true }
-        }, {
-          path: '/stock/out/detail',
-          component: () => import('@/xt_pages/stock/stockOutDetail'),
-          name: 'stockOutDetail',
-          hidden: true,
-          is_menu: false,
-          meta: { title: 'stockOutDetail', noCache: true }
-        }, {
-          path: '/stock/cancel/add',
-          component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
-          name: 'cancelStockOrderAdd',
-          hidden: true,
-          is_menu: false,
-          meta: { title: 'cancelStockOrderAdd', noCache: true }
-        }, {
-          path: '/stock/cancel/detail',
-          component: () => import('@/xt_pages/stock/cancelStockDetail'),
-          name: 'cancelStockDetail',
-          hidden: true,
-          is_menu: false,
-          meta: { title: 'cancelStockDetail', noCache: true }
-        },
-        {
-          path: '/stock/config',
-          component: () => import('@/xt_pages/stock/index'),
-          name: 'config',
-          meta: { title: 'config' }
-        }
+    {
+      path: '/stock/in',
+      component: () => import('@/xt_pages/stock/stockInOrder'),
+      name: 'stockInOrder',
+      meta: { title: 'stockInOrder', noCache: true }
+    }, {
+      path: '/stock/return',
+      component: () => import('@/xt_pages/stock/salesReturnOrder'),
+      name: 'salesReturnOrder',
+      meta: { title: 'salesReturnOrder', noCache: true }
+    },
+    {
+      path: '/stock/out',
+      component: () => import('@/xt_pages/stock/stockOutOrder'),
+      name: 'stockOutOrder',
+      meta: { title: 'stockOutOrder', noCache: true }
+    }, {
+      path: '/stock/cancel',
+      component: () => import('@/xt_pages/stock/cancelStockOrder'),
+      name: 'cancelStockOrder',
+      meta: { title: 'cancelStockOrder', noCache: true }
+    }, {
+      path: '/stock/in/other',
+      component: () => import('@/xt_pages/stock/otherStockInOrder'),
+      name: 'otherStockInOrder',
+      meta: { title: 'otherStockInOrder', noCache: true }
+    }, {
+      path: '/stock/return/other',
+      component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
+      name: 'otherSalesReturnOrder',
+      meta: { title: 'otherSalesReturnOrder', noCache: true }
+    }, {
+      path: '/stock/out/other',
+      component: () => import('@/xt_pages/stock/otherStockOutOrder'),
+      name: 'otherStockOutOrder',
+      meta: { title: 'otherStockOutOrder', noCache: true }
+    }, {
+      path: '/stock/cancel/other',
+      component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
+      name: 'otherCancelStockOrder',
+      meta: { title: 'otherCancelStockOrder', noCache: true }
+    }, {
+      path: '/stock/query',
+      component: () => import('@/xt_pages/stock/stockQuery'),
+      name: 'stockQuery',
+      meta: { title: 'stockQuery', noCache: true  }
+    }, {
+      path: '/stock/detail',
+      component: () => import('@/xt_pages/stock/stockDetailIndex'),
+      name: 'stockDetail',
+      meta: { title: 'stockDetail', noCache: true  }
+    }, {
+      path: '/stock/in/add',
+      component: () => import('@/xt_pages/stock/stockInOrderAdd'),
+      name: 'stockInOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInOrderAdd', noCache: true }
+    }, {
+      path: '/stock/in/detail',
+      component: () => import('@/xt_pages/stock/stockInDetail'),
+      name: 'stockInDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInDetail', noCache: true  }
+    }, {
+      path: '/stock/return/detail',
+      component: () => import('@/xt_pages/stock/salesReturnDetail'),
+      name: 'salesReturnDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'salesReturnDetail', noCache: true  }
+    }, {
+      path: '/stock/return/add',
+      component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
+      name: 'salesReturnOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'salesReturnOrderAdd', noCache: true }
+    }, {
+      path: '/stock/out/add',
+      component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
+      name: 'stockOutOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockOutOrderAdd', noCache: true }
+    }, {
+      path: '/stock/out/detail',
+      component: () => import('@/xt_pages/stock/stockOutDetail'),
+      name: 'stockOutDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockOutDetail', noCache: true }
+    }, {
+      path: '/stock/cancel/add',
+      component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+      name: 'cancelStockOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelStockOrderAdd', noCache: true }
+    }, {
+      path: '/stock/cancel/detail',
+      component: () => import('@/xt_pages/stock/cancelStockDetail'),
+      name: 'cancelStockDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelStockDetail', noCache: true }
+    }, {
+      path: '/stock/config',
+      component: () => import('@/xt_pages/stock/index'),
+      name: 'config',
+      meta: { title: 'config', noCache: true  }
+    }, {
+      path: '/stock/print',
+      component: () => import('@/xt_pages/stock/detail/print'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '库存打印',
+        noCache: true
+      }
+    }
   ]
 }

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -232,7 +232,7 @@
                     <table class="inside_table">
                       <tbody>
                       <!-- <thead> -->
-                        <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理纪录：</td></tr>
+                        <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理记录：</td></tr>
                         <tr>
                           <td width="100">时间</td>
                           <td width="30">T<br>C°</td>
@@ -275,7 +275,7 @@
                           <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:'/'}}</td>
                           <td>{{monitor_record.sodium_concentration?monitor_record.sodium_concentration:''}}</td>
                           <td style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">{{monitor_record.symptom}}&nbsp;{{monitor_record.dispose}}&nbsp;{{monitor_record.result}}</span></div></td>
-                          <td><span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span><img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""  v-else style="height: 20px;"></td>
+                          <td><span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span><img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""  v-else ></td>
                         </tr>
                       </tbody>
                     </table>
@@ -335,7 +335,7 @@
                     <table class="inside_table">
                       <tbody>
                       <!-- <thead> -->
-                        <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理纪录：</td></tr>
+                        <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理记录：</td></tr>
                         <tr>
                           <td width="100">时间</td>
                           <td width="30">T<br>C°</td>
@@ -360,13 +360,13 @@
                           <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:'/'}}</td>
                           <td>{{monitor_record.sodium_concentration?monitor_record.sodium_concentration:''}}</td>
                           <td style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> {{monitor_record.symptom}}&nbsp;{{monitor_record.dispose}}&nbsp;{{monitor_record.result}}</span></div></td>
-                          <td><span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span><img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""  v-else style="height: 20px;"></td>
+                          <td><span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span><img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""  v-else ></td>
                         </tr>
                       </tbody>
                     </table>
                   </td>
                 </tr>
-                <tr><td colspan="2" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">三、透析后护理纪录</td></tr>
+                <tr><td colspan="2" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">三、透析后护理记录</td></tr>
                 <tr>
                   <td>
                     <div class="row" style="padding: 2px 0;line-height:19px;">
@@ -474,14 +474,14 @@
                         责任护士：
                         <div class="under_line" style="width: 100px;">
                           <span v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
-                          <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" alt="" srcset="" v-else style="height: 20px;">
+                          <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" alt="" srcset="" v-else >
                         </div>
                       </div>
                       <div class="inline_block" >
                         &emsp;核对人：
                         <div class="under_line" style="width: 100px;">
                           <span v-if="setAdminUserES(record.check, 'modifier') == ''">{{getAdminUser(record.check, 'modifier')}}</span>
-                          <img class="es-img" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset="" v-else style="height: 20px;">
+                          <img class="es-img" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset="" v-else>
                         </div>
                       </div>
                       <div class="inline_block">
@@ -494,7 +494,7 @@
                         &emsp;收针者：
                         <div class="under_line" style="width: 100px;">
                           <span v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
-                          <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" alt="" srcset="" v-else style="height: 20px;">
+                          <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" alt="" srcset="" v-else >
                         </div>
                       </div>
                     </div>
@@ -519,7 +519,7 @@
                         血透室护士签名：
                         <div class="under_line" style="width: 100px;">
                           <span v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
-                          <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" alt="" srcset="" v-else style="height: 20px;">
+                          <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" alt="" srcset="" v-else >
                         </div>
                       </div>
                       <div class="inline_block" >
@@ -810,15 +810,15 @@
                   <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td>
                   <td height="60px">
                     <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">{{getAdminUser(advice, 'advice_doctor')}}</span>
-                    <img class="es-img" :src="setAdminUserES(advice, 'advice_doctor')" alt="" srcset="" v-else style="height: 20px;">
+                    <img class="es-img" :src="setAdminUserES(advice, 'advice_doctor')" alt="" srcset="" v-else >
                   </td>
                   <td height="60px">
                       <span v-if="setAdminUserES(advice, 'checker') == ''">{{getAdminUser(advice, 'checker')}}</span>
-                      <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else style="height: 20px;">
+                      <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else >
                   </td>
                   <td height="60px">
                     <span v-if="setAdminUserES(advice, 'execution_staff') == ''">{{getAdminUser(advice, 'execution_staff')}}</span>
-                    <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')" alt="" srcset="" v-else style="height: 20px;">
+                    <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')" alt="" srcset="" v-else >
                   </td>
                   <td height="60px"><span v-if="advice.execution_time"> {{getTime(advice.execution_time,'{y}-{m}-{d} {h}:{i}')}} </span> </td>
                 </tr>
@@ -905,15 +905,15 @@
                     <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td>
                     <td height="60px">
                       <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">{{getAdminUser(advice, 'advice_doctor')}}</span>
-                      <img class="es-img" :src="setAdminUserES(advice, 'advice_doctor')" alt="" srcset="" v-else style="height: 20px;">
+                      <img class="es-img" :src="setAdminUserES(advice, 'advice_doctor')" alt="" srcset="" v-else >
                     </td>
                     <td height="60px">
                         <span v-if="setAdminUserES(advice, 'checker') == ''">{{getAdminUser(advice, 'checker')}}</span>
-                        <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else style="height: 20px;">
+                        <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else >
                     </td>
                     <td height="60px">
                       <span v-if="setAdminUserES(advice, 'execution_staff') == ''">{{getAdminUser(advice, 'execution_staff')}}</span>
-                      <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')" alt="" srcset="" v-else style="height: 20px;">
+                      <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')" alt="" srcset="" v-else >
                     </td>
                     <td height="60px"><span v-if="advice.execution_time"> {{getTime(advice.execution_time,'{y}-{m}-{d} {h}:{i}')}} </span> </td>
                   </tr>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -224,7 +224,7 @@
               <td style="padding: 0;" colspan="2">
                 <table class="inside_table">
                   <tbody>
-                    <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理纪录：</td></tr>
+                    <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理记录：</td></tr>
                     <tr>
                       <td width="100">时间</td>
                       <td width="30">T<br>C°</td>
@@ -328,7 +328,7 @@
               <td style="padding: 0;" colspan="2">
                 <table class="inside_table">
                   <tbody>
-                    <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理纪录：</td></tr>
+                    <tr><td colspan="10" style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">二、透析中护理记录：</td></tr>
                     <tr>
                       <td width="100">时间</td>
                       <td width="30">T<br>C°</td>
@@ -362,7 +362,7 @@
                 </table>
               </td>
             </tr>
-            <tr><td colspan="2"  style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">三、透析后护理纪录</td></tr>
+            <tr><td colspan="2"  style="font-size:16px;padding: 6px 8px;line-height: 30px;text-align:left;">三、透析后护理记录</td></tr>
             <tr>
               <td>
                 <div class="row" style="padding: 2px 0;line-height:19px;">

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -10,17 +10,22 @@
     <el-row :gutter="20">
       <el-col :span="8">
         <el-table
-          :data="propForm.goodType"
-          ref="templatetable"
+          :data="propForm.goods"
+          ref="table"
           border
           highlight-current-row
           max-height="250"
+          :row-class-name="tableRows"
+          @row-click="onRowClicks"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           @current-change="goodTypeTableChange"
           style="width: 100%">
           <el-table-column
-            prop="type_name"
+            align="center"
             label="商品类型">
+            <template slot-scope="scope">
+              <span>{{getGoodTypeName(scope.row)}}</span>
+            </template>
           </el-table-column>
         </el-table>
       </el-col>
@@ -32,7 +37,7 @@
           max-height="250"
           @row-click="clickRow"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-
+          @select="selectGoodInfo"
           @selection-change="changeGoodInfoTableData"
           @select-all="changeAllGoodInfoTableData"
           row-key="row_key"
@@ -90,7 +95,9 @@
         keywords: '',
         multipleSelection: [],
         currentGoodTypeId: 0,
-        isClose: false
+        isClose: false,
+        table_current_index: -1
+
       }
     },
     props: {
@@ -103,44 +110,100 @@
       hide:function(){
         this.visibility = false
         this.goodInfoTableData = []
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let key in this.propForm.goods[i]) {
+            if (key != 'index') {
+              this.propForm.goods[i][key].isSelected = false
+            }
+          }
+        }
 
       },
       show:function(){
         this.visibility = true
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let key in this.propForm.goods[i]) {
+            if (key != 'index') {
+              this.propForm.goods[i][key].isSelected = false
+            }
+          }
+        }
       },
       goodTypeTableChange: function(currentRow, oldCurrentRow) {
-        this.currentGoodTypeId = currentRow.id
+        console.log(currentRow)
+        let keyName = ''
+        for (var key in currentRow) {
+          if (key != 'index') {
+            keyName = key
+          }
+        }
         this.goodInfoTableData = []
         this.goodInfo = []
-        console.log(this.propForm.goodInfo)
-
+        if (keyName.length > 0) {
+          this.currentGoodTypeId = parseInt(keyName)
+          this.goodInfo = currentRow[keyName]
+          this.goodInfoTableData = (currentRow[keyName])
+        }
 
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.currentGoodTypeId == this.propForm.goodInfo[i].good_type_id) {
-              this.goodInfo.push(this.propForm.goodInfo[i])
-              this.goodInfoTableData.push(this.propForm.goodInfo[i])
+        for (let i = 0; i < this.goodInfoTableData.length; i++) {
+          if (this.goodInfoTableData[i].isSelected) {
+            this.$nextTick(function() {
+              this.$refs.multipleTable.toggleRowSelection(this.goodInfoTableData[i])
+            })
           }
         }
+        //
+        //
+        //
+        //
+        // for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+        //   if (this.currentGoodTypeId == this.propForm.goodInfo[i].good_type_id) {
+        //       this.goodInfo.push(this.propForm.goodInfo[i])
+        //       this.goodInfoTableData.push(this.propForm.goodInfo[i])
+        //   }
+        // }
       },
       cancle: function() {
         this.$emit('dialog-cancle', this.getValue())
         this.$refs.multipleTable.clearSelection()
-        this.$refs.templatetable.setCurrentRow(null);
+        this.$refs.table.setCurrentRow(null);
         this.goodInfoTableData = []
 
       },
       comfirm: function() {
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
-        this.$refs.templatetable.setCurrentRow(null);
+        this.$refs.table.setCurrentRow(null);
         this.goodInfoTableData = []
 
       },
       getValue: function() {
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let key in this.propForm.goods[i]) {
+            if (key != 'index') {
+              for(let a= 0; a < this.propForm.goods[i][key].length; a++){
+                if (this.propForm.goods[i][key][a].isSelected) {
+                  this.multipleSelection.push(this.propForm.goods[i][key][a])
+                }
+              }
+            }
+          }
+        }
+
+        const obj3 = {}
+        this.multipleSelection =  this.multipleSelection.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
         const obj = {
           selectedGoodInfo: this.multipleSelection,
           goodTypeId: this.currentGoodTypeId
         }
+
+        console.log(obj)
+
+
         return obj
       }, goodTypeSelect: function(id) {
         this.tempGoodInfo = []
@@ -184,11 +247,57 @@
         }
       }, changeGoodInfoTableData: function(val) {
         this.multipleSelection = val
-      }, changeAllGoodInfoTableData: function(val) {
-        this.multipleSelection = val
+      }, changeAllGoodInfoTableData: function(selection) {
+        var goodInfos = this.propForm.goods[this.table_current_index][this.currentGoodTypeId]
+        for (let y = 0; y < goodInfos.length; y++) {
+          goodInfos[y].isSelected = false
+        }
+        if (selection.length > 0) {
+          for (let y = 0; y < goodInfos.length; y++) {
+            for (let i = 0; i < selection.length; i++) {
+              if (goodInfos[y].id == selection[i].id) {
+                goodInfos[y].isSelected = true
+              }
+            }
+          }
+        }
       },clickRow:function(row) {
         this.$refs.multipleTable.toggleRowSelection(row)
 
+      }, tableRows({ row, rowIndex }) {
+        // 把每一行的索引放进row
+        row.index = rowIndex
+      },
+      onRowClicks(row, event, column) {
+        this.table_current_index = row.index
+      }, selectGoodInfo(selection, row) {
+        var goodInfos = this.propForm.goods[this.table_current_index][this.currentGoodTypeId]
+        for (let y = 0; y < goodInfos.length; y++) {
+          goodInfos[y].isSelected = false
+        }
+        if (selection.length > 0) {
+          for (let y = 0; y < goodInfos.length; y++) {
+            for (let i = 0; i < selection.length; i++) {
+              if (goodInfos[y].id == selection[i].id) {
+                goodInfos[y].isSelected = true
+              }
+            }
+          }
+        }
+
+      }, getGoodTypeName: function(val) {
+        let keyName = ''
+        for (var key in val) {
+          if (key != 'index') {
+            keyName = key
+          }
+        }
+        let keys = parseInt(keyName)
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == keys) {
+            return this.propForm.goodType[i].type_name
+          }
+        }
       }
     }
   }

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -10,18 +10,22 @@
     <el-row :gutter="20">
       <el-col :span="8">
         <el-table
-          :data="propForm.goodType"
-          ref="templatetable"
+          :data="propForm.goods"
+          ref=""
           border
           highlight-current-row
           max-height="250"
+          :row-class-name="tableRows"
+          @row-click="onRowClicks"
           @current-change="goodTypeTableChange"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           style="width: 100%">
           <el-table-column
             align="center"
-            prop="type_name"
             label="商品类型">
+            <template slot-scope="scope">
+              <span>{{getGoodTypeName(scope.row)}}</span>
+            </template>
           </el-table-column>
         </el-table>
       </el-col>
@@ -33,6 +37,7 @@
           max-height="250"
           @row-click="clickRow"
           @selection-change="changeGoodInfoTableData"
+          @select="selectGoodInfo"
           @select-all="changeAllGoodInfoTableData"
           row-key="row_key"
           style="width: 100%"
@@ -95,7 +100,9 @@
         multipleSelection: [],
         currentGoodTypeId: 0,
         isClose: false,
-        visibility: false
+        visibility: false,
+        SelectedDatas: [],
+        table_current_index: -1
       }
     },
     props: {
@@ -106,47 +113,78 @@
     methods: {
       hide: function() {
         this.visibility = false
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let key in this.propForm.goods[i]) {
+            if (key != 'index') {
+              this.propForm.goods[i][key].isSelected = false
+            }
+          }
+        }
       },
       show: function() {
         this.visibility = true
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let key in this.propForm.goods[i]) {
+            if (key != 'index') {
+              this.propForm.goods[i][key].isSelected = false
+            }
+          }
+        }
       },
       goodTypeTableChange: function(currentRow, oldCurrentRow) {
-        this.currentGoodTypeId = currentRow.id
-        const params = {
-          id: currentRow.id
+        let keyName = ''
+        for (var key in currentRow) {
+          if (key != 'index') {
+            keyName = key
+          }
         }
         this.goodInfoTableData = []
         this.goodInfo = []
-        GetGoodInfoByGoodId(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.goodInfo.push(response.data.data.list[i])
-              this.goodInfoTableData.push(response.data.data.list[i])
-            }
+        if (keyName.length > 0) {
+          this.currentGoodTypeId = parseInt(keyName)
+          this.goodInfo = currentRow[keyName]
+          this.goodInfoTableData = (currentRow[keyName])
+        }
+
+        for (let i = 0; i < this.goodInfoTableData.length; i++) {
+          if (this.goodInfoTableData[i].isSelected) {
+            this.$nextTick(function() {
+              this.$refs.multipleTable.toggleRowSelection(this.goodInfoTableData[i])
+            })
           }
-        })
+        }
+
       },
       cancle: function(formName) {
         this.goodInfo = []
         this.goodInfoTableData = []
         this.$emit('dialog-cancle', this.getValue())
         this.$refs.multipleTable.clearSelection()
-        this.$refs.templatetable.setCurrentRow(null)
+        this.$refs.table.setCurrentRow(null)
+
       },
       comfirm: function(formName) {
         this.goodInfo = []
         this.goodInfoTableData = []
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
-        this.$refs.templatetable.setCurrentRow(null)
+        this.$refs.table.setCurrentRow(null)
       },
       getValue: function() {
+        for (let i = 0; i < this.propForm.goods.length; i++) {
+          for (let key in this.propForm.goods[i]) {
+            if (key != 'index') {
+              for(let a= 0; a < this.propForm.goods[i][key].length; a++){
+                if (this.propForm.goods[i][key][a].isSelected) {
+                  this.multipleSelection.push(this.propForm.goods[i][key][a])
+                }
+              }
+            }
+          }
+        }
+
         const obj = {
           selectedGoodInfo: this.multipleSelection,
-          goodTypeId: this.currentGoodTypeId
         }
         return obj
       }, goodTypeSelect: function(id) {
@@ -191,13 +229,69 @@
           this.goodInfoTableData.push(searchArr[i])
         }
       }, changeGoodInfoTableData: function(val) {
-        this.multipleSelection = val
-      }, changeAllGoodInfoTableData: function(val) {
-        this.multipleSelection = val
+      }, changeAllGoodInfoTableData: function(selection) {
+
+        var goodInfos = this.propForm.goods[this.table_current_index][this.currentGoodTypeId]
+        for (let y = 0; y < goodInfos.length; y++) {
+          goodInfos[y].isSelected = false
+        }
+        if (selection.length > 0) {
+          for (let y = 0; y < goodInfos.length; y++) {
+            for (let i = 0; i < selection.length; i++) {
+              if (goodInfos[y].id == selection[i].id) {
+                goodInfos[y].isSelected = true
+              }
+            }
+          }
+        }
+
       }, clickRow: function(row) {
         this.$refs.multipleTable.toggleRowSelection(row)
+      }, newGroupObject: function() {
+        return Object.assign(
+          {},
+          {
+            id: 0,
+            info: []
+          }
+        )
+      }, getGoodTypeName: function(val) {
+        let keyName = ''
+        for (var key in val) {
+          if (key != 'index') {
+            keyName = key
+          }
+        }
+        let keys = parseInt(keyName)
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == keys) {
+            return this.propForm.goodType[i].type_name
+          }
+        }
+      }, tableRows({ row, rowIndex }) {
+        // 把每一行的索引放进row
+        row.index = rowIndex
+      },
+      onRowClicks(row, event, column) {
+        this.table_current_index = row.index
+      }, selectGoodInfo(selection, row) {
+        var goodInfos = this.propForm.goods[this.table_current_index][this.currentGoodTypeId]
+        for (let y = 0; y < goodInfos.length; y++) {
+          goodInfos[y].isSelected = false
+        }
+        if (selection.length > 0) {
+          for (let y = 0; y < goodInfos.length; y++) {
+            for (let i = 0; i < selection.length; i++) {
+              if (goodInfos[y].id == selection[i].id) {
+                goodInfos[y].isSelected = true
+              }
+            }
+          }
+        }
+
       }
     }
+
   }
 
 </script>

src/xt_pages/stock/config/goodInfo.vue

@@ -3,29 +3,36 @@
   <div class=" sign-and-weigh-box" style="background: white">
 
 
-    <good-info-dailog ref="dialog" :titles="goodInfo.goodInfoDialog.goodInfoTitle" :formValue="goodInfo.goodInfoDialog.formValue"
+    <good-info-dailog ref="dialog" :titles="goodInfo.goodInfoDialog.goodInfoTitle"
+                      :formValue="goodInfo.goodInfoDialog.formValue"
                       :visibility="goodInfo.goodInfoDialog.isVisibility"
                       :isCreated="goodInfo.goodInfoDialog.isCreated" v-on:dialog-comfirm="goodInfoDialogComfirm"
                       v-on:dialog-cancle="goodInfoDialogCancle"></good-info-dailog>
 
 
+    <div class="cell clearfix">
+      <el-input size="small" style="width: 400px;" class="filter-item" v-model="keywords"
+                placeholder="商品编码/规格名称"/>
+      <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+    <div class="cell clearfix" style="float: right">
+      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showInfoDialog">新增</el-button>
+    </div>
+
     <el-row :gutter="15">
       <el-col>
 
 
-        <div>
-          <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showInfoDialog">新增</el-button>
-        </div>
-
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodInfo.goodInfoData"  style="width: 100%" border
+        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodInfo.goodInfoData"
+                  style="width: 100%" border
                   v-loading="goodInfo.loading"
         >
-          <el-table-column label="商品编码"  align="center">
+          <el-table-column label="商品编码" align="center">
             <template slot-scope="scope">
               {{scope.row.good_code}}
             </template>
           </el-table-column>
-          <el-table-column label="规格名称"  align="center">
+          <el-table-column label="规格名称" align="center">
             <template slot-scope="scope">
               {{scope.row.specification_name}}
 
@@ -33,29 +40,29 @@
           </el-table-column>
 
 
-          <el-table-column label="进价"  align="center" >
+          <el-table-column label="进价" align="center">
             <template slot-scope="scope" v-if="scope.row.buy_price">
 
               {{scope.row.buy_price}}
 
             </template>
           </el-table-column>
-          <el-table-column label="出货价"  align="center" >
+          <el-table-column label="出货价" align="center">
             <template slot-scope="scope" v-if="scope.row.sell_price">
               {{scope.row.sell_price}}
             </template>
           </el-table-column>
           <!--<el-table-column label="有效期预警"  align="center">-->
-            <!--<template slot-scope="scope" v-if="scope.row.expiry_date_warn_day_count">-->
-              <!--{{scope.row.expiry_date_warn_day_count}}-->
-            <!--</template>-->
+          <!--<template slot-scope="scope" v-if="scope.row.expiry_date_warn_day_count">-->
+          <!--{{scope.row.expiry_date_warn_day_count}}-->
+          <!--</template>-->
           <!--</el-table-column>-->
           <!--<el-table-column label="库存预警" align="center">-->
-            <!--<template slot-scope="scope" v-if="scope.row.stock_warn_count">-->
-              <!--{{scope.row.stock_warn_count}}-->
-            <!--</template>-->
+          <!--<template slot-scope="scope" v-if="scope.row.stock_warn_count">-->
+          <!--{{scope.row.stock_warn_count}}-->
+          <!--</template>-->
           <!--</el-table-column>-->
-          <el-table-column label="操作" align="center" >
+          <el-table-column label="操作" align="center">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
@@ -101,24 +108,24 @@
 
 <script>
 
-  import GoodInfoDailog from "../Dialog/goodInfoDailog";
+  import GoodInfoDailog from '../Dialog/goodInfoDailog'
   import {
-    GetAllGoodType,
     createGoodInfo,
-    modifyGoodInfo,
     deleteGoodInfo,
-    GetGoodInfoByGoodId,
-    GetGoodInfo,
     GetAllDeals,
+    GetAllGoodType,
     GetAllManufacturer,
-    getGoodInfoList
-  } from "@/api/stock";
+    GetGoodInfo,
+    GetGoodInfoByGoodId,
+    getGoodInfoList,
+    modifyGoodInfo
+  } from '@/api/stock'
 
   export default {
     components: {
-      GoodInfoDailog,
+      GoodInfoDailog
     },
-    name: "goodInfo",
+    name: 'goodInfo',
     data() {
       return {
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
@@ -127,7 +134,7 @@
         pageSelect: 0,
         page: 1,
         limit: 7,
-
+        keywords: '',
         goodInfo: {
           loading: false,
           goodInfoData: [],
@@ -152,22 +159,26 @@
               dealers: [],
               manufacturers: [],
               goodType: [],
-              goodUnit: [],
+              goodUnit: []
             },
 
-            isVisibility: false,
-          },
+            isVisibility: false
+          }
 
-        },
+        }
 
-      };
+      }
     },
     methods: {
-     handleGoodInfoEdit: function (index, row) {
+      search: function() {
+        this.getList()
+
+      },
+      handleGoodInfoEdit: function(index, row) {
 
-       this.getAllDealer()
-       this.getAllManufacturer()
-       this.getAllGoodType()
+        this.getAllDealer()
+        this.getAllManufacturer()
+        this.getAllGoodType()
         this.goodInfo.editGoodId = row.id
         this.goodInfo.editGoodIndex = index
 
@@ -176,35 +187,32 @@
         }
         GetGoodInfo(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             console.log(response.data.data.goodInfo)
 
-            if(response.data.data.goodInfo.good_unit <= 0){
-              this.goodInfo.goodInfoDialog.formValue.good_unit = ""
-            }else{
+            if (response.data.data.goodInfo.good_unit <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.good_unit = ''
+            } else {
               this.goodInfo.goodInfoDialog.formValue.good_unit = response.data.data.goodInfo.good_unit
             }
 
+            if (response.data.data.goodInfo.manufacturer <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
 
-            if(response.data.data.goodInfo.manufacturer <= 0){
-              this.goodInfo.goodInfoDialog.formValue.manufacturer = ""
-
-            }else{
+            } else {
               this.goodInfo.goodInfoDialog.formValue.manufacturer = response.data.data.goodInfo.manufacturer
 
             }
 
-            if(response.data.data.goodInfo.dealer <= 0){
-              this.goodInfo.goodInfoDialog.formValue.dealer = ""
-            }else{
+            if (response.data.data.goodInfo.dealer <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.dealer = ''
+            } else {
               this.goodInfo.goodInfoDialog.formValue.dealer = response.data.data.goodInfo.dealer
 
             }
 
-
-
             this.goodInfo.goodInfoDialog.formValue.specification_name = response.data.data.goodInfo.specification_name
             this.goodInfo.goodInfoDialog.formValue.buy_price = response.data.data.goodInfo.buy_price
             this.goodInfo.goodInfoDialog.formValue.sell_price = response.data.data.goodInfo.sell_price
@@ -214,16 +222,14 @@
             this.goodInfo.goodInfoDialog.formValue.remark = response.data.data.goodInfo.remark
             this.goodInfo.goodInfoDialog.isCreated = 2
             this.goodInfo.good_code = response.data.data.goodInfo.good_code
-            this.goodInfo.goodInfoDialog.formValue.good_id =response.data.data.goodInfo.good_type_id
+            this.goodInfo.goodInfoDialog.formValue.good_id = response.data.data.goodInfo.good_type_id
             this.$refs.dialog.show()
 
           }
-        });
-
-
+        })
 
       },
-      handleGoodInfoDelete: function (index, row) {
+      handleGoodInfoDelete: function(index, row) {
 
         this.$confirm('确认删除这条商品信息?', '删除商品信息', {
           confirmButtonText: '确定',
@@ -236,25 +242,25 @@
 
           deleteGoodInfo(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
-              this.goodInfo.goodInfoData.splice(index, 1);
-              this.$message.success("删除成功")
+              this.goodInfo.goodInfoData.splice(index, 1)
+              this.$message.success('删除成功')
             }
-          });
+          })
         }).catch(() => {
-        });
+        })
 
       },
-      showGoodInfoDetails: function (index, row) {
+      showGoodInfoDetails: function(index, row) {
         let params = {
           id: row.id
         }
         GetGoodInfo(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.goodInfo.goodInfoDialog.formValue.specification_name = response.data.data.goodInfo.specification_name
             this.goodInfo.goodInfoDialog.formValue.good_unit = response.data.data.goodInfo.good_unit
@@ -270,18 +276,20 @@
             this.goodInfo.goodInfoDialog.isCreated = 3
             this.goodInfo.goodInfoDialog.isVisibility = true
           }
-        });
+        })
       }, getList() {
         this.goodInfo.loading = true
         let params = {
-          'page': this.page,
-          'limit': this.limit
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords
+
         }
         getGoodInfoList(params).then(response => {
           if (response.data.state == 0) {
             this.goodInfo.loading = false
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.goodInfo.loading = false
             this.total = response.data.data.total
@@ -291,16 +299,16 @@
 
             }
           }
-        });
+        })
 
-      }, tableRowClassName({row, rowIndex}) {
+      }, tableRowClassName({ row, rowIndex }) {
         //把每一行的索引放进row
-        row.index = rowIndex;
+        row.index = rowIndex
       },
       onRowClick(row, event, column) {
 
         this.goodInfo.goodInfoData = []
-        this.goodType.tableCurrentIndex = row.index;
+        this.goodType.tableCurrentIndex = row.index
         this.goodInfo.goodInfoDialog.formValue.good_id = row.id
         let params = {
           'id': row.id
@@ -309,17 +317,17 @@
         GetGoodInfoByGoodId(params).then(response => {
           if (response.data.state == 0) {
             this.goodInfo.loading = false
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.goodInfo.loading = false
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.goodInfo.goodInfoData.push(response.data.data.list[i])
             }
           }
-        });
+        })
 
-      }, goodInfoDialogComfirm: function (val) {
+      }, goodInfoDialogComfirm: function(val) {
 
         if (val.isCreated == 2) { //修改
           val['id'] = this.goodInfo.editGoodId
@@ -327,8 +335,8 @@
 
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$refs.dialog.hide()
 
@@ -339,57 +347,54 @@
               this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
               this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
 
-              this.$message.success("修改成功")
-
+              this.$message.success('修改成功')
 
             }
-          });
+          })
 
         } else if (val.isCreated == 1) { //新增
           createGoodInfo(val).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$refs.dialog.hide()
 
               this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
 
-              this.$message.success("新增成功")
-
+              this.$message.success('新增成功')
 
             }
-          });
+          })
 
         }
 
       },
-      goodInfoDialogCancle: function () {
+      goodInfoDialogCancle: function() {
         this.$refs.dialog.hide()
 
-
-      }, showInfoDialog: function () {
+      }, showInfoDialog: function() {
         this.$refs.dialog.show()
         this.getAllDealer()
         this.getAllManufacturer()
         this.goodInfo.goodInfoDialog.formValue.goodType = []
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               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
               this.goodInfo.goodInfoDialog.isCreated = 1
             }
           }
-        });
+        })
         this.goodInfo.goodInfoDialog.formValue.good_id = ''
         this.goodInfo.goodInfoDialog.formValue.specification_name = ''
         this.goodInfo.goodInfoDialog.formValue.buy_price = ''
@@ -402,49 +407,48 @@
         this.goodInfo.goodInfoDialog.formValue.stock_warn_count = ''
         this.goodInfo.goodInfoDialog.formValue.is_reuse = '2'
 
-
-      }, getAllDealer: function () {
+      }, getAllDealer: function() {
         this.goodInfo.goodInfoDialog.formValue.dealers = []
         GetAllDeals().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             for (let i = 0; i < response.data.data.dealer.length; i++) {
               this.goodInfo.goodInfoDialog.formValue.dealers.push(response.data.data.dealer[i])
             }
           }
-        });
-      }, getAllManufacturer: function () {
+        })
+      }, getAllManufacturer: function() {
         this.goodInfo.goodInfoDialog.formValue.manufacturers = []
         GetAllManufacturer().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             for (let i = 0; i < response.data.data.manufacturer.length; i++) {
               this.goodInfo.goodInfoDialog.formValue.manufacturers.push(response.data.data.manufacturer[i])
             }
           }
-        });
-      }, getAllGoodType: function () {
+        })
+      }, getAllGoodType: function() {
         this.goodInfo.goodInfoDialog.formValue.goodType = []
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
             }
           }
-        });
+        })
       }, handleSizeChange(val) {
-        this.limit = val;
-        this.getList();
+        this.limit = val
+        this.getList()
       }, handleCurrentChange(val) {
-        this.page = val;
-        this.getList();
+        this.page = val
+        this.getList()
       }
     },
     created() {
@@ -455,7 +459,7 @@
       this.goodInfo.goodInfoDialog.formValue.goodUnit = this.$store.getters.good_unit
 
     }
-  };
+  }
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
@@ -463,10 +467,11 @@
     border: 1px #dcdfe6 solid;
     padding: 30px 20px 30px 20px;
 
-    .border {
-      border-bottom: 1px #dcdfe6 solid;
-      margin: 0px 0 20px 0;
-    }
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
   }
 
   .title {
@@ -474,7 +479,6 @@
     line-height: 44px;
     padding: 0 0 0 10px;
     margin: 0 0 10px 0;
-    // border-radius: 4px 4px 0 0;
   }
 
   .edit_separater {

src/xt_pages/stock/config/goodType.vue

@@ -1,24 +1,30 @@
 <template>
 
   <div class=" sign-and-weigh-box" style="background: white">
-    <good-type-dialog ref="dialog" :titles="goodType.goodTypeDialog.goodTypeTitle" :formValue="goodType.goodTypeDialog.formValue"
+    <good-type-dialog ref="dialog" :titles="goodType.goodTypeDialog.goodTypeTitle"
+                      :formValue="goodType.goodTypeDialog.formValue"
                       :visibility="goodType.goodTypeDialog.isVisibility"
                       :isCreated="goodType.goodTypeDialog.isCreated" v-on:dialog-comfirm="goodTypeDialogComfirm"
                       v-on:dialog-cancle="goodTypeDialogCancle"></good-type-dialog>
-
-
+    <div class="cell clearfix">
+      <el-input size="small" style="width: 400px;" class="filter-item" v-model="keywords"
+                placeholder="类型编码/类型名称"/>
+      <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+
+    </div>
+    <div class="cell clearfix" style="float: right">
+      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showDialog">新增</el-button>
+    </div>
     <el-row :gutter="15">
       <el-col>
 
-        <div>
-          <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showDialog">新增</el-button>
-        </div>
 
         <!--<div class="dataTitle"></div>-->
 
         <div style="margin-bottom: 10px;">
         </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodType.goodTypeData"  style="width: 100%" border
+        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodType.goodTypeData"
+                  style="width: 100%" border
                   highlight-current-row
                   @row-click="onRowClick"
                   :row-class-name="tableRowClassName"
@@ -34,7 +40,7 @@
               {{scope.row.type_name}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" >
+          <el-table-column label="操作" align="center">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
@@ -140,256 +146,261 @@
 </template>
 
 <script>
-import goodTypeDialog from "../Dialog/goodTypeDialog";
-import {
-  createGoodType,
-  modifyGoodType,
-  getGoodTypeList,
-  deleteGoodType,
-  GetGoodType,
-  createGoodInfo,
-  modifyGoodInfo,
-  getGoodInfoList,
-  deleteGoodInfo,
-  GetGoodInfoByGoodId,
-  GetGoodInfo,
-  GetAllDeals,
-  GetAllManufacturer,
-  GetAllGoodType
-} from "@/api/stock";
-import GoodInfoDailog from "../Dialog/goodInfoDailog";
-
-export default {
-  components: {
-    goodTypeDialog
-  },
-  name: "goodType",
-  data() {
-    return {
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      total: 0,
-      pageTotal: 0,
-      pageSelect: 0,
-      page: 1,
-      limit: 7,
-
-      goodType: {
-        loading: false,
-        goodTypeData: [],
-        type_code: "",
-        editInfoId: "",
-        editInfoIndex: "",
-        tableCurrentIndex: -1,
-        goodTypeDialog: {
-          goodTypeTitle: "新增商品类型",
-          isCreated: 1, //1.创建 2.编辑 3.查看详情
-          formValue: {
-            type_name: "",
-            remark: ""
-          },
-          isVisibility: false
+  import goodTypeDialog from '../Dialog/goodTypeDialog'
+  import {
+    createGoodInfo,
+    createGoodType,
+    deleteGoodInfo,
+    deleteGoodType,
+    GetAllDeals,
+    GetAllGoodType,
+    GetAllManufacturer,
+    GetGoodInfo,
+    GetGoodInfoByGoodId,
+    getGoodInfoList,
+    GetGoodType,
+    getGoodTypeList,
+    modifyGoodInfo,
+    modifyGoodType
+  } from '@/api/stock'
+
+  export default {
+    components: {
+      goodTypeDialog
+    },
+    name: 'goodType',
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        page: 1,
+        limit: 7,
+        keywords: '',
+        goodType: {
+          loading: false,
+          goodTypeData: [],
+          type_code: '',
+          editInfoId: '',
+          editInfoIndex: '',
+          tableCurrentIndex: -1,
+          goodTypeDialog: {
+            goodTypeTitle: '新增商品类型',
+            isCreated: 1, //1.创建 2.编辑 3.查看详情
+            formValue: {
+              type_name: '',
+              remark: ''
+            },
+            isVisibility: false
+          }
         }
       }
-    };
-  },
-  methods: {
-    handleEdit: function(index, row) {
-      this.goodType.editTypeId = row.id;
-      this.goodType.editTypeIndex = index;
-      let params = {
-        id: row.id
-      };
-      GetGoodType(params).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          this.goodType.goodTypeDialog.formValue.remark =
-            response.data.data.goodType.remark;
-          this.goodType.goodTypeDialog.formValue.type_name =
-            response.data.data.goodType.type_name;
-          this.goodType.goodTypeDialog.isCreated = 2;
-          this.$refs.dialog.show();
-          this.goodType.type_code = response.data.data.goodType.type_code;
-        }
-      });
     },
-    handleDelete: function(index, row) {
-      this.$confirm("确认删除这条商品类型?", "删除商品类型", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
+    methods: {
+      search: function() {
+        this.getList()
+      },
+      handleEdit: function(index, row) {
+        this.goodType.editTypeId = row.id
+        this.goodType.editTypeIndex = index
+        let params = {
+          id: row.id
+        }
+        GetGoodType(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.goodType.goodTypeDialog.formValue.remark =
+              response.data.data.goodType.remark
+            this.goodType.goodTypeDialog.formValue.type_name =
+              response.data.data.goodType.type_name
+            this.goodType.goodTypeDialog.isCreated = 2
+            this.$refs.dialog.show()
+            this.goodType.type_code = response.data.data.goodType.type_code
+          }
+        })
+      },
+      handleDelete: function(index, row) {
+        this.$confirm('确认删除这条商品类型?', '删除商品类型', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let params = {
+              id: row.id
+            }
+
+            deleteGoodType(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.goodType.goodTypeData.splice(index, 1)
+                this.goodType.tableCurrentIndex = -1
+
+                this.$message.success('删除成功')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
+      showDetails: function(index, row) {
+        let params = {
+          id: row.id
+        }
+        GetGoodType(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.goodType.goodTypeDialog.formValue.type_name =
+              response.data.data.goodType.type_name
+            this.goodType.goodTypeDialog.formValue.remark =
+              response.data.data.goodType.remark
+            this.goodType.goodTypeDialog.isCreated = 3
+            this.goodType.goodTypeDialog.isVisibility = true
+          }
+        })
+      },
+
+      goodTypeDialogComfirm: function(val) {
+
+        if (val.isCreated == 2) {
+          //修改
           let params = {
-            id: row.id
-          };
+            type_name: val.type_name,
+            remark: val.remark,
+            type_code: this.goodType.type_code,
+            id: this.goodType.editTypeId
+          }
 
-          deleteGoodType(params).then(response => {
+          modifyGoodType(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
-              this.goodType.goodTypeData.splice(index, 1);
-              this.goodType.tableCurrentIndex = -1;
+              this.$refs.dialog.hide()
 
-              this.$message.success("删除成功");
+              this.goodType.goodTypeData[this.goodType.editTypeIndex].type_name =
+                response.data.data.goodTypes.type_name
+              this.goodType.goodTypeData[this.goodType.editTypeIndex].remark =
+                response.data.data.goodTypes.remark
+
+              this.$message.success('修改成功')
             }
-          });
-        })
-        .catch(() => {});
-    },
-    showDetails: function(index, row) {
-      let params = {
-        id: row.id
-      };
-      GetGoodType(params).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          this.goodType.goodTypeDialog.formValue.type_name =
-            response.data.data.goodType.type_name;
-          this.goodType.goodTypeDialog.formValue.remark =
-            response.data.data.goodType.remark;
-          this.goodType.goodTypeDialog.isCreated = 3;
-          this.goodType.goodTypeDialog.isVisibility = true;
+          })
+        } else if (val.isCreated == 1) {
+          //新增
+          createGoodType(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$refs.dialog.hide()
+              this.goodType.goodTypeData.unshift(response.data.data.goodTypes)
+              this.$message.success('新增成功')
+            }
+          })
         }
-      });
-    },
-
-    goodTypeDialogComfirm: function(val) {
+      },
+      goodTypeDialogCancle: function() {
+        this.$refs.dialog.hide()
+      },
+      showDialog: function() {
+        this.goodType.goodTypeDialog.isCreated = 1
+        this.$refs.dialog.show()
+      },
+      getList() {
+        this.goodType.loading = true
 
-      if (val.isCreated == 2) {
-        //修改
         let params = {
-          type_name: val.type_name,
-          remark: val.remark,
-          type_code: this.goodType.type_code,
-          id: this.goodType.editTypeId
-        };
-
-        modifyGoodType(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.$refs.dialog.hide();
-
-            this.goodType.goodTypeData[this.goodType.editTypeIndex].type_name =
-              response.data.data.goodTypes.type_name;
-            this.goodType.goodTypeData[this.goodType.editTypeIndex].remark =
-              response.data.data.goodTypes.remark;
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords
 
-            this.$message.success("修改成功");
-          }
-        });
-      } else if (val.isCreated == 1) {
-        //新增
-        createGoodType(val).then(response => {
+        }
+        getGoodTypeList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.goodType.loading = false
+            this.$message.error(response.data.msg)
+            return false
           } else {
-            this.$refs.dialog.hide();
-            this.goodType.goodTypeData.unshift(response.data.data.goodTypes);
-            this.$message.success("新增成功");
+            this.goodType.loading = false
+            this.total = response.data.data.total
+            this.goodType.goodTypeData = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.goodType.goodTypeData.push(response.data.data.list[i])
+            }
           }
-        });
-      }
-    },
-    goodTypeDialogCancle: function() {
-      this.$refs.dialog.hide();
-    },
-    showDialog: function() {
-      this.goodType.goodTypeDialog.isCreated = 1;
-      this.$refs.dialog.show();
-    },
-    getList() {
-      this.goodType.loading = true;
-
-      let params = {
-        page: this.page,
-        limit: this.limit
-      };
-      getGoodTypeList(params).then(response => {
-        if (response.data.state == 0) {
-          this.goodType.loading = false;
-          this.$message.error(response.data.msg);
-          return false;
+        })
+      },
+      tableRowClassName({ row, rowIndex }) {
+        //把每一行的索引放进row
+        row.index = rowIndex
+      },
+      onRowClick(row, event, column) {
+        this.goodType.tableCurrentIndex = row.index
+      },
+      showInfoDialog: function() {
+        if (this.goodType.tableCurrentIndex == -1) {
+          this.$message.error('请先选择商品类型')
+          return
         } else {
-          this.goodType.loading = false;
-          this.total = response.data.data.total;
-          this.goodType.goodTypeData = [];
-          for (let i = 0; i < response.data.data.list.length; i++) {
-            this.goodType.goodTypeData.push(response.data.data.list[i]);
-          }
+          this.getAllGoodType()
         }
-      });
-    },
-    tableRowClassName({ row, rowIndex }) {
-      //把每一行的索引放进row
-      row.index = rowIndex;
-    },
-    onRowClick(row, event, column) {
-      this.goodType.tableCurrentIndex = row.index;
-    },
-    showInfoDialog: function() {
-      if (this.goodType.tableCurrentIndex == -1) {
-        this.$message.error("请先选择商品类型");
-        return;
-      } else {
-        this.getAllGoodType();
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
       }
     },
-    handleSizeChange(val) {
-      this.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.page = val;
-      this.getList();
+    created() {
+      this.getList()
     }
-  },
-  created() {
-    this.getList();
   }
-};
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-.information {
-  border: 1px #dcdfe6 solid;
-  padding: 30px 20px 30px 20px;
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
 
   .border {
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
-}
-
-.title {
-  height: 44px;
-  line-height: 44px;
-  padding: 0 0 0 10px;
-  margin: 0 0 10px 0;
-  // border-radius: 4px 4px 0 0;
-}
-
-.edit_separater {
-  border-top: 1px solid rgb(233, 233, 233);
-  margin-top: 15px;
-  margin-bottom: 15px;
-}
+
+  }
+
+  .title {
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    margin: 0 0 10px 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 .cell {
+    font-size: 12px;
+  }
 
-.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-  background: #6fb5fa;
-}
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
 
 </style>

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -1,5 +1,7 @@
 <template>
     <div>
+      <el-button style="float: right" size="small" icon="el-icon-printer" @click="PrintAction" type="primary">打印
+      </el-button>
       <div class="cell clearfix" >
         <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/规格名称"/>
         <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
@@ -178,6 +180,17 @@
       }
     },
     methods: {
+      PrintAction: function() {
+        this.$router.push({
+          path: '/stock/print',
+          query: {
+            type: 4,
+            start_time: this.start_time,
+            end_time: this.end_time
+
+          }
+        })
+      },
       changeType: function(val) {
         this.order_type = val
         this.GetCancelStock()

src/xt_pages/stock/detail/print.vue

@@ -0,0 +1,415 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+          <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title" v-if="type == 1">入库单</div>
+          <div class="order-title" v-if="type == 2">退货单</div>
+          <div class="order-title" v-if="type == 3">出库单</div>
+          <div class="order-title" v-if="type == 4">退库单</div>
+
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="250">商品类型</td>
+              <td style="line-height: 50px" width="250">规格名称</td>
+              <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height: 50px" width="80" v-if="type == 1 || type == 3">总价</td>
+              <td style="line-height: 50px" width="">备 注</td>
+            </tr>
+
+
+            <tr v-for="(stock,index) in stockDatas" :key="stock.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span v-if="stock">{{stock.specification_name}}</span>
+              </td>
+              <td style="line-height: 50px">{{calCount(stock)}}</td>
+              <td style="line-height: 50px" v-if="type == 1 || type == 3">{{calTotal(stock)}}</td>
+              <td style="line-height: 50px"></td>
+            </tr>
+            </tbody>
+          </table>
+          <table class="print-table" border="1" v-if="type == 1 || type == 3">
+            <tbody>
+            <tr>
+              <td width="633" style="line-height: 50px">合计</td>
+              <td width="80" style="line-height: 50px">{{calTotalPrice()}}</td>
+              <td></td>
+            </tr>
+
+            </tbody>
+          </table>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        loading: false,
+        orgname: '',
+        queryParams: {
+          start_time: this.$route.query.start_time,
+          end_time: this.$route.query.end_time,
+          type: this.$route.query.type
+        },
+        totalPrice: 0,
+        stockDatas: [],
+        goodUnit: [],
+        type: this.$route.query.type,
+        start_time: this.$route.query.start_time,
+        end_time: this.$route.query.end_time,
+
+      }
+    },
+    methods: {
+      getDateOne(){
+        if (this.type == 1){
+          return "入库日期: "+this.start_time +"~"+this.end_time
+        }else if(this.type == 2){
+          return "退货日期: "+this.start_time +"~"+this.end_time
+        }else if(this.type == 3){
+          return "出库日期: "+this.start_time +"~"+this.end_time
+        }else if(this.type == 4){
+          return "退库日期: "+this.start_time +"~"+this.end_time
+        }
+
+      },
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      }, getDialysisRecord() {
+        this.loading = true
+        getPrintStockGood(this.queryParams).then(response => {
+          if (response.data.state == 1) {
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              if (this.type == 1) {
+                if (response.data.data.list[i].query_warehousing_info.length > 0) {
+                  this.stockDatas.push(response.data.data.list[i])
+                }
+
+              } else if (this.type == 2) {
+                if (response.data.data.list[i].query_sales_return_info.length > 0) {
+                  this.stockDatas.push(response.data.data.list[i])
+                }
+
+              } else if (this.type == 3) {
+                if (response.data.data.list[i].query_warehouseout_info.length > 0) {
+                  this.stockDatas.push(response.data.data.list[i])
+                }
+
+              } else if (this.type == 4) {
+                if (response.data.data.list[i].query_cancel_stock_info.length > 0) {
+                  this.stockDatas.push(response.data.data.list[i])
+                }
+              }
+
+            }
+            var obj =  null
+            for(let i = 0; i <this.stockDatas.length;i++){
+              obj = this.stockDatas[i]
+            }
+
+            // if (this.stockDatas.length < 50) {
+            //   var nl = 50 - this.stockDatas.length
+            //   for (let index = 0; index < nl; index++) {
+            //     this.stockDatas.push([])
+            //   }
+            // }
+            this.loading = false
+          } else {
+            this.loading = false
+            this.$message.error('请求数据失败')
+            return false
+          }
+        })
+      }, calCount(stock) {
+        let total = 0
+        var array = []
+        if (this.type == 1) {
+          array = stock.query_warehousing_info
+        } else if (this.type == 2) {
+          array = stock.query_sales_return_info
+        } else if (this.type == 3) {
+          array = stock.query_warehouseout_info
+        } else if (this.type == 4) {
+          array = stock.query_cancel_stock_info
+        }
+
+        for (let i = 0; i < array.length; i++) {
+          if (this.type == 1) {
+            total = total + array[i].warehousing_count
+          } else if (this.type == 2) {
+            total = total + array[i].count
+          } else if (this.type == 3) {
+            total = total + array[i].count
+
+          } else if (this.type == 4) {
+            total = total + array[i].count
+          }
+        }
+        return total
+
+      }, calTotal(stock) {
+        console.log(stock)
+
+        var array = []
+        if (this.type == 1) {
+          array = stock.query_warehousing_info
+        } else if (this.type == 3) {
+          array = stock.query_warehouseout_info
+        }
+
+        let total_price = 0.0
+        for (let i = 0; i < array.length; i++) {
+          total_price = total_price + array[i].total_price
+        }
+        return total_price
+      }, calTotalPrice() {
+
+        var amountPrice = 0
+        for (let i = 0; i < this.stockDatas.length; i++) {
+          var obj = this.stockDatas[i]
+          var len = 0
+          if (this.type == 1) {
+            len = obj.query_warehousing_info.length
+          } else if (this.type == 3) {
+            len = obj.query_warehouseout_info.length
+          }
+          let total_price = 0.0
+          for (let a = 0; a < len; a++) {
+            if (this.type == 1) {
+              total_price = total_price + obj.query_warehousing_info[a].total_price
+            } else if (this.type == 3) {
+              total_price = total_price + obj.query_warehouseout_info[a].total_price
+            }
+          }
+          amountPrice = amountPrice + total_price
+        }
+        return amountPrice
+      }
+    },
+    created() {
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      this.goodUnit = this.$store.getters.good_unit
+
+      this.getDialysisRecord()
+
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -1,5 +1,7 @@
 <template>
     <div>
+      <el-button style="float: right" size="small" icon="el-icon-printer" @click="PrintAction" type="primary">打印
+      </el-button>
       <div class="cell clearfix" >
         <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/规格名称"/>
         <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
@@ -238,6 +240,16 @@
       },
       AddNewOrder: function() {
         this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+      },PrintAction: function() {
+        this.$router.push({
+          path: '/stock/print',
+          query: {
+            type: 2,
+            start_time: this.start_time,
+            end_time: this.end_time
+
+          }
+        })
       },
       GetCancelStock: function() {
         const Params = {

src/xt_pages/stock/detail/stockInDetail.vue

@@ -1,131 +1,137 @@
 <template>
-    <div>
-      <div class="cell clearfix">
-        <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/规格名称"/>
-        <el-button size="small" 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 size="small" 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="cellLine"> - </span>
-        <el-date-picker size="small" 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 size="small" 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 size="small" 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"  width="200">
-            <template slot-scope="scope">
-              {{scope.row.warehousing_order}}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="商品类型" align="center">
-            <template slot-scope="scope">
-              {{typeName(scope.row.good_type_id)}}
-            </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">
-              {{getTotal(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>
+    <el-button style="float: right" size="small" icon="el-icon-printer" @click="PrintAction" type="primary">打印
+    </el-button>
+
+    <div class="cell clearfix">
+      <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/规格名称"/>
+      <el-button size="small" 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 size="small" 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="cellLine"> - </span>
+      <el-date-picker size="small" 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 size="small" 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 size="small" 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" width="200">
+          <template slot-scope="scope">
+            {{scope.row.warehousing_order}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="商品类型" align="center">
+          <template slot-scope="scope">
+            {{typeName(scope.row.good_type_id)}}
+          </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">
+            {{getTime(scope.row.Warehousing.warehousing_time)}}
+          </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">
+            <span v-if="scope.row.is_total == 0">{{getTotal(scope.row.price,scope.row.warehousing_count)}}</span>
+            <span v-else>{{scope.row.total}}</span>
+
+          </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>
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
-  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+  import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood } from '@/api/stock'
 
   export default {
     name: 'stockInDetail',
@@ -161,6 +167,10 @@
           { value: 1, label: '耗材入库单' },
           { value: 2, label: '其他入库单' }
         ],
+        newDate: [
+          { name: '合计', num: '111111' }
+
+        ],
 
         searchKey: '',
         type: 1,
@@ -206,7 +216,7 @@
         }
 
         return name
-      },   typeName: function(good_type_id) {
+      }, typeName: function(good_type_id) {
         let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == good_type_id) {
@@ -225,6 +235,11 @@
         return name
       },
       search: function() {
+
+
+
+
+
         const Params = {
           page: this.page,
           limit: this.limit,
@@ -241,13 +256,32 @@
           } 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])
+              var obj = response.data.data.list[i]
+              obj['is_total'] = 0
+              this.cancelStockDate.push(obj)
             }
+
+            this.cancelStockDate.push({
+              warehousing_order: '合计',
+              is_total: 1,
+              total: response.data.data.total_price,
+              Warehousing: {
+                warehousing_time: 0
+              }
+            })
+
           }
         })
       },
+      getTime: function(val) {
+        if (val == 0) {
+          return ''
+        } else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+      },
       AddNewOrder: function() {
-        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type } })
       },
       GetCancelStock: function() {
         const Params = {
@@ -268,8 +302,18 @@
           } 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])
+              var obj = response.data.data.list[i]
+              obj['is_total'] = 0
+              this.cancelStockDate.push(obj)
             }
+            this.cancelStockDate.push({
+              warehousing_order: '合计',
+              is_total: 1,
+              total: response.data.data.total_price,
+              Warehousing: {
+                warehousing_time: 0
+              }
+            })
           }
         })
       }, getXuserName(id) {
@@ -344,7 +388,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type } })
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)
@@ -430,21 +474,32 @@
           })
         }).catch(() => {
         })
-      },getTotal:function(price, total) {
-        var m = 0,r1,r2;
-        var s1 = price.toString();
-        var s2 = total.toString();
-        try{
+      }, getTotal: function(price, total) {
+        var m = 0, r1, r2
+        var s1 = price.toString()
+        var s2 = total.toString()
+        try {
           m += s1.split('.')[1].length
-        }catch(e){
+        } catch (e) {
 
         }
-        try{}catch(e){
+        try {
+        } catch (e) {
           m += s2.split('.')[1].length
         }
-        r1 = Number(price.toString().replace(".",""));
-        r2 = Number(total.toString().replace(".",""));
-        return r1 * r2 / Math.pow(10,m);
+        r1 = Number(price.toString().replace('.', ''))
+        r2 = Number(total.toString().replace('.', ''))
+        return r1 * r2 / Math.pow(10, m)
+      }, PrintAction: function() {
+        this.$router.push({
+          path:'/stock/print',
+          query:{
+            type: 1,
+            start_time: this.start_time,
+            end_time: this.end_time
+
+          }
+        })
       }
     }
   }

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -1,5 +1,7 @@
 <template>
     <div>
+      <el-button style="float: right" size="small" icon="el-icon-printer" @click="PrintAction" type="primary">打印
+      </el-button>
       <div class="cell clearfix" >
         <el-input size="small" style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/规格名称"/>
         <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
@@ -83,7 +85,9 @@
 
           <el-table-column label="操作时间" align="center">
             <template slot-scope="scope">
-              {{ scope.row.WarehouseOut.warehouse_out_time | parseTime('{y}-{m}-{d}')}}
+
+              {{getTime(scope.row.WarehouseOut.warehouse_out_time)}}
+
             </template>
           </el-table-column>
           <el-table-column label="制单人" align="center">
@@ -104,8 +108,8 @@
           </el-table-column>
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              {{getTotal(scope.row.price,scope.row.count)}}
-
+              <span v-if="scope.row.is_total == 0">{{getTotal(scope.row.price,scope.row.count)}}</span>
+              <span v-else>{{scope.row.total}}</span>
             </template>
           </el-table-column>
 
@@ -245,8 +249,18 @@
           } 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])
+              var obj = response.data.data.list[i]
+              obj['is_total'] = 0
+              this.cancelStockDate.push(obj)
             }
+            this.cancelStockDate.push({
+              warehouse_out_order_number: '合计',
+              is_total:1,
+              total:response.data.data.total_price,
+              WarehouseOut: {
+                warehouse_out_time: 0
+              }
+            })
           }
         })
       },
@@ -272,8 +286,19 @@
           } 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])
+              var obj = response.data.data.list[i]
+              obj['is_total'] = 0
+              this.cancelStockDate.push(obj)
             }
+            this.cancelStockDate.push({
+              warehouse_out_order_number: '合计',
+              is_total:1,
+              total:response.data.data.total_price,
+              WarehouseOut: {
+                warehouse_out_time: 0
+              }
+            })
+
           }
         })
       }, getXuserName(id) {
@@ -450,6 +475,22 @@
         r1 = Number(price.toString().replace(".",""));
         r2 = Number(total.toString().replace(".",""));
         return r1 * r2 / Math.pow(10,m);
+      }, getTime:function(val){
+        if(val == 0){
+          return ""
+        }else{
+          return uParseTime(val, '{y}-{m}-{d}');
+        }
+      }, PrintAction: function() {
+        this.$router.push({
+          path:'/stock/print',
+          query:{
+            type: 3,
+            start_time: this.start_time,
+            end_time: this.end_time
+
+          }
+        })
       }
     }
   }

src/xt_pages/stock/salesReturnEdit.vue

@@ -178,6 +178,7 @@
         // prop
         isVisibility: false,
         propForm: {
+          goods:[],
           goodType: [],
           goodInfo: [],
           goodUnit: [],
@@ -194,24 +195,25 @@
         salesReturn: {},
         manufacturer: [],
         dealer: [],
-        goodType: []
+        goodType: [],
+        goodInfo:[]
       }
     },
     methods: {
       comfirm: function(val) {
         this.$refs.dialog.hide()
-
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+          for (let i = val.selectedGoodInfo.length -1; i >= 0 ; i--) {
             if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
+              this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
             } else {
               const tempForm = {}
               tempForm['id'] = 0
-              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_type_id'] = val.selectedGoodInfo[i].good_type_id
               tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['count'] = ''
+              tempForm['return_count'] = ''
+              tempForm['price'] = ''
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
@@ -258,6 +260,11 @@
             }
 
 
+            for (let i = 0; i < this.warehouseInfoList.length; i++) {
+              this.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+
+
             const obj = {}
             const obj2 = {}
             const obj3 = {}
@@ -297,9 +304,9 @@
         return name
       }, specificationName: function(good_info_id) {
         let name = ''
-        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
-          if (this.propForm.goodInfo[i].id == good_info_id) {
-            name = this.propForm.goodInfo[i].specification_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
@@ -311,7 +318,8 @@
         tempObj['count'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        if (row.id == 0) {
+        console.log(row.id)
+        if (row.id == undefined || row.id == 0) {
           this.recordInfo.recordData.splice(index, 1)
         } else {
           const params = {
@@ -343,6 +351,8 @@
       }, showDialog(index, row) {
         this.currentIndex = index
         this.propForm.goodType = []
+        this.propForm.goods = []
+
 
         if (this.form.manufacturer == -1 && this.form.dealer == -1) {
           for (let i = 0; i < this.warehouseInfoList.length; i++) {
@@ -440,6 +450,33 @@
         }, [])
 
 
+
+
+
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          let goodInfo = []
+          let goodObj = {}
+
+          for (let a = 0; a < this.propForm.goodInfo.length; a++) {
+            var respObj = this.propForm.goodInfo[a]
+            respObj['isSelected'] = false
+            if (respObj.type.id == this.propForm.goodType[i].id) {
+              goodInfo.push(respObj)
+            }
+          }
+          const obj = {}
+          goodInfo = goodInfo.reduce((cur, next) => {
+            obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+            return cur
+          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+          this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+          this.propForm.goods.push(goodObj)
+
+        }
+
+
+
         // if (this.form.manufacturer == 0 && this.form.dealer == 0) {
         //   for (let i = 0; i < this.warehouseInfoList.length; i++) {
         //     this.propForm.goodType.push(this.warehouseInfoList[i].info.type)

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -177,6 +177,7 @@
         // prop
         isVisibility: false,
         propForm: {
+          goods:[],
           goodType: [],
           goodInfo: [],
           goodUnit: [],
@@ -197,18 +198,18 @@
       comfirm: function(val) {
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
-            if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
-              this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
-            } else {
-              const tempForm = {}
-              tempForm['good_type_id'] = val.goodTypeId
-              tempForm['good_id'] = val.selectedGoodInfo[i].id
-              tempForm['return_count'] = ''
-              tempForm['price'] = ''
-              this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
-            }
+          for (let i = val.selectedGoodInfo.length -1; i >= 0 ; i--) {
+              if (i == 0) {
+                this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
+                this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+              } else {
+                const tempForm = {}
+                tempForm['good_type_id'] = val.selectedGoodInfo[i].good_type_id
+                tempForm['good_id'] = val.selectedGoodInfo[i].id
+                tempForm['return_count'] = ''
+                tempForm['price'] = ''
+                this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
+              }
           }
         }
         this.propForm.goodType = []
@@ -321,6 +322,8 @@
       }, showDialog(index, row) {
         this.currentIndex = index
         this.propForm.goodType = []
+        this.propForm.goods = []
+
         //根据选择经销商和厂商过滤商品类型
 
         if (this.form.manufacturer == -1 && this.form.dealer == -1) {
@@ -418,6 +421,37 @@
           return cur
         }, [])
 
+
+
+
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          let goodInfo = []
+          let goodObj = {}
+
+          for (let a = 0; a < this.propForm.goodInfo.length; a++) {
+            var respObj = this.propForm.goodInfo[a]
+            respObj['isSelected'] = false
+            if (respObj.type.id == this.propForm.goodType[i].id) {
+              goodInfo.push(respObj)
+            }
+          }
+          const obj = {}
+          goodInfo = goodInfo.reduce((cur, next) => {
+            obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+            return cur
+          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+          this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+          this.propForm.goods.push(goodObj)
+
+        }
+
+
+
+
+
+
+
         this.$refs.dialog.show()
       }, back() {
         this.$router.go(-1)
@@ -480,6 +514,7 @@
       tempObj['return_count'] = ''
       tempObj['price'] = ''
       this.recordInfo.recordData.push(tempObj)
+      console.log(this.recordInfo.recordData)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
     }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -264,6 +264,7 @@
         // prop
         isVisibility: false,
         propForm: {
+          goods: [],
           goodType: [],
           goodInfo: [],
           goodUnit: [],
@@ -340,18 +341,20 @@
         this.isVisibility = true
       }, comfirm: function(val) {
         this.propForm.goodType = []
+        this.propForm.goods = []
+
         this.$refs.dialog.hide()
         console.log(val)
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
             if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
+              this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
 
             } else {
               const tempForm = {}
-              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['number'] = ''
               tempForm['product_date'] = ''
@@ -361,8 +364,6 @@
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
-              // this.recordInfo.recordData.add(tempForm,this.currentIndex + i)
-              // this.recordInfo.recordData.push(tempForm)
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
@@ -371,6 +372,7 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.propForm.goodType = []
+        this.propForm.goods = []
         this.$refs.dialog.hide()
       }, GetAllGoodType: function() {
         GetAllGoodType().then(response => {
@@ -517,7 +519,28 @@
               }, []) // 设置cur默认类型为数组，并且初始值为空的数组
             }
 
+            for (let i = 0; i < this.propForm.goodType.length; i++) {
+              let goodInfo = []
+              let goodObj = {}
+
+              for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+                var respObj = response.data.data.goodInfo[a]
+                respObj['isSelected'] = false
+                if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                  goodInfo.push(respObj)
+                }
+              }
+              const obj = {}
+              goodInfo = goodInfo.reduce((cur, next) => {
+                obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+              this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+              this.propForm.goods.push(goodObj)
 
+            }
+            console.log( this.propForm.goods)
           }
         )
       },
@@ -588,7 +611,6 @@
       ,
       changeManufacturer(val) {
 
-
       }, changeDealer(val) {
 
       }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -265,6 +265,7 @@ export default {
         // prop
         isVisibility: false,
         propForm: {
+          goods: [],
           goodType: [],
           goodInfo: [],
           goodUnit: [],
@@ -288,18 +289,19 @@ export default {
       comfirm: function(val) {
         this.$refs.dialog.hide()
         this.propForm.goodType = []
+        this.propForm.goods = []
 
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
             if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
+              this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
 
             } else {
               const tempForm = {}
               tempForm['id'] = 0
-              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_type_id'] = val.selectedGoodInfo[i].good_type_id
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['number'] = ''
               tempForm['product_date'] = ''
@@ -317,6 +319,8 @@ export default {
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
+        this.propForm.goods = []
+
         this.propForm.goodType = []
 
       }, GetConfigInfo: function() {
@@ -439,7 +443,29 @@ export default {
                 return cur
               }, []) // 设置cur默认类型为数组，并且初始值为空的数组
             }
-            loading.close()
+
+          for (let i = 0; i < this.propForm.goodType.length; i++) {
+            let goodInfo = []
+            let goodObj = {}
+
+            for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+              var respObj = response.data.data.goodInfo[a]
+              respObj['isSelected'] = false
+              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                goodInfo.push(respObj)
+              }
+            }
+            const obj = {}
+            goodInfo = goodInfo.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+            this.propForm.goods.push(goodObj)
+
+          }
+          loading.close()
 
           }
         )

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -207,6 +207,7 @@
         // prop
         isVisibility: false,
         propForm: {
+          goods:[],
           goodType: [],
           goodInfo: [],
           goodUnit: [],
@@ -228,17 +229,18 @@
         this.$refs.dialog.hide()
         this.propForm.goodType = []
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+          for (let i = val.selectedGoodInfo.length - 1;i >= 0 ; i--) {
             if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
+              this.recordInfo.recordData[this.currentIndex].good_type_id =  val.selectedGoodInfo[i].good_type_id
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
             } else {
+              console.log(val.selectedGoodInfo[i].buy_price.toString())
               const tempForm = {}
-              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
-              tempForm['price'] = val.selectedGoodInfo[i].buy_price
+              tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
               tempForm['remark'] = ''
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
@@ -357,6 +359,10 @@
       }, showDialog(index, row) {
         this.currentIndex = index
         this.propForm.goodType = []
+        this.propForm.goods = []
+
+
+
         if (this.form.manufacturer == -1 && this.form.dealer == -1) {
           for (let i = 0; i < this.warehouseInfoList.length; i++) {
             if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == 0) {
@@ -454,43 +460,30 @@
 
 
 
-        // if (this.form.manufacturer == 0 && this.form.dealer == 0) {
-        //   for (let i = 0; i < this.warehouseInfoList.length; i++) {
-        //     this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-        //   }
-        //   const obj3 = {}
-        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-        //     return cur
-        //   }, [])
-        // } else {
-        //   if (this.form.manufacturer == 0 && this.form.dealer != 0) {
-        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
-        //       if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-        //       }
-        //     }
-        //   }
-        //   if (this.form.manufacturer != 0 && this.form.dealer == 0) {
-        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
-        //       if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-        //       }
-        //     }
-        //   }
-        //   if (this.form.manufacturer != 0 && this.form.dealer != 0) {
-        //     for (let i = 0; i < this.warehouseInfoList.length; i++) {
-        //       if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-        //         this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-        //       }
-        //     }
-        //   }
-        //   const obj3 = {}
-        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-        //     return cur
-        //   }, [])
-        // }
+
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          let goodInfo = []
+          let goodObj = {}
+
+          for (let a = 0; a < this.propForm.goodInfo.length; a++) {
+            var respObj = this.propForm.goodInfo[a]
+            respObj['isSelected'] = false
+            if (respObj.type.id == this.propForm.goodType[i].id) {
+              goodInfo.push(respObj)
+            }
+          }
+          const obj = {}
+          goodInfo = goodInfo.reduce((cur, next) => {
+            obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+            return cur
+          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+          this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+          this.propForm.goods.push(goodObj)
+
+        }
+
+
         this.$refs.dialog.show()
 
       }, back() {

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -207,6 +207,7 @@
         // prop
         isVisibility: false,
         propForm: {
+          goods:[],
           goodType: [],
           goodInfo: [],
           goodUnit: [],
@@ -231,17 +232,19 @@
         this.$refs.dialog.hide()
 
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+          for (let i = val.selectedGoodInfo.length - 1;i >= 0 ; i--) {
             if (i == 0) {
-              this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
+              this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+
             } else {
               const tempForm = {}
               tempForm['id'] = 0
-              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_type_id'] = val.selectedGoodInfo[i].good_type_id
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
-              tempForm['price'] = ''
+              tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
+
               tempForm['remark'] = ''
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
@@ -375,42 +378,125 @@
       }, showDialog(index, row) {
         this.currentIndex = index
         this.propForm.goodType = []
+        this.propForm.goods = []
+
+        if (this.form.manufacturer == -1 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+        if (this.form.manufacturer == -1 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+        if (this.form.manufacturer == -1 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == 0 && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
+            }
+          }
+        }
+
         if (this.form.manufacturer == 0 && this.form.dealer == 0) {
           for (let i = 0; i < this.warehouseInfoList.length; i++) {
             this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+            this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
           }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
-        } else {
-          if (this.form.manufacturer == 0 && this.form.dealer != 0) {
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
+        }
+
+        if (this.form.manufacturer == 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
             }
           }
-          if (this.form.manufacturer != 0 && this.form.dealer == 0) {
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
+        }
+
+        if (this.form.manufacturer != 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == 0 && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
             }
           }
-          if (this.form.manufacturer != 0 && this.form.dealer != 0) {
-            for (let i = 0; i < this.warehouseInfoList.length; i++) {
-              if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer && this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
-                this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
-              }
+        }
+
+        if (this.form.manufacturer != 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer && this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
             }
           }
-          const obj3 = {}
+        }
+
+        if (this.form.manufacturer == 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+
+            }
+          }
+        }
+        if (this.form.manufacturer != 0 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseInfoList[i].info)
+            }
+          }
+        }
+
+
+        const obj3 = {}
           this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
             obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
             return cur
           }, [])
+        const obj4 = {}
+        this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+          obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+
+          for (let i = 0; i < this.propForm.goodType.length; i++) {
+            let goodInfo = []
+            let goodObj = {}
+
+            for (let a = 0; a < this.propForm.goodInfo.length; a++) {
+              var respObj = this.propForm.goodInfo[a]
+              respObj['isSelected'] = false
+              if (respObj.type.id == this.propForm.goodType[i].id) {
+                goodInfo.push(respObj)
+              }
+            }
+            const obj = {}
+            goodInfo = goodInfo.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+            this.propForm.goods.push(goodObj)
+
         }
         this.$refs.dialog.show()
 

src/xt_pages/stock/stockQuery.vue

@@ -1,11 +1,19 @@
 <template>
-<div class="main-contain">
-  <div class="position">
-    <bread-crumb :crumbs='crumbs'></bread-crumb>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
 
-  </div>
-  <div class="app-container ">
-      <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}"  :data="WarehouseInfo.warehouseInfoDate" :class="signAndWeighBoxPatients" border
+    </div>
+    <div class="app-container ">
+      <div class="cell clearfix">
+        <el-input size="small" style="width: 400px;" class="filter-item" v-model="keywords"
+                  placeholder="商品编码/商品名称/规格名称"/>
+        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+
+      <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="WarehouseInfo.warehouseInfoDate"
+                :class="signAndWeighBoxPatients" border
                 v-loading="WarehouseInfo.loading"
       >
 
@@ -24,14 +32,16 @@
             <span>{{scope.row.specification_name}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="入库数量" align="center" >
+        <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
-            <span @click="showStockInDetailDialog(scope.row.good_id)" style="color: #579ef8">{{stockInCount(scope.row)}}</span>
+            <span @click="showStockInDetailDialog(scope.row.good_id)"
+                  style="color: #579ef8">{{stockInCount(scope.row)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="入库退货" align="center">
           <template slot-scope="scope">
-            <span @click="showSaleReturnDetailDialog(scope.row)" style="color: #F56C6C">{{salesReturnCount(scope.row)}}</span>
+            <span @click="showSaleReturnDetailDialog(scope.row)"
+                  style="color: #F56C6C">{{salesReturnCount(scope.row)}}</span>
 
           </template>
         </el-table-column>
@@ -48,7 +58,8 @@
         </el-table-column>
         <el-table-column label="出库退库" align="center">
           <template slot-scope="scope">
-            <span @click="showCancelStockDetailDialog(scope.row)"  style="color: #F56C6C">{{cancelStockCount(scope.row)}}</span>
+            <span @click="showCancelStockDetailDialog(scope.row)"
+                  style="color: #F56C6C">{{cancelStockCount(scope.row)}}</span>
 
           </template>
         </el-table-column>
@@ -59,8 +70,8 @@
         </el-table-column>
 
         <el-table-column label="剩余库存" align="center">
-          <template slot-scope="scope" >
-            <span  style="color: red">{{(stockInCount(scope.row) - salesReturnCount(scope.row) - stockOutCount(scope.row)) + cancelStockCount(scope.row)}}</span>
+          <template slot-scope="scope">
+            <span style="color: red">{{(stockInCount(scope.row) - salesReturnCount(scope.row) - stockOutCount(scope.row)) + cancelStockCount(scope.row)}}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -75,37 +86,33 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
       </el-pagination>
-  </div>
+    </div>
   </div>
 
 </template>
 
 <script>
-  import {uParseTime} from "@/utils/tools";
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-  import {
-    getAllStockQueryList,
-    GetAllGoodInfo,
-    GetAllGoodType,
-  } from "@/api/stock";
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { GetAllGoodInfo, GetAllGoodType, getAllStockQueryList } from '@/api/stock'
 
   export default {
-    name: "stockIn",
+    name: 'stockIn',
     created() {
       this.GetAllStockQuery()
       this.GetAllGoodInfo()
       this.GetAllGoodType()
     },
-    components:{
+    components: {
       BreadCrumb
     },
     data() {
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/query', name: '库存查询' },
+          { path: '/stock/query', name: '库存查询' }
         ],
-
+        keywords:'',
         total: 0,
         multipleSelection: [],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
@@ -117,37 +124,38 @@
         goodInfo: [],
         WarehouseInfo: {
           loading: false,
-          warehouseInfoDate: [],
+          warehouseInfoDate: []
         }
-      };
+      }
     },
     methods: {
-      GetAllStockQuery: function () {
+      GetAllStockQuery: function() {
+        console.log(this.keywords)
         let Params = {
           page: this.page,
           limit: this.limit,
+          keyword:this.keywords
         }
         this.WarehouseInfo.loading = true
-
         this.WarehouseInfo.warehouseInfoDate = []
         getAllStockQueryList(Params).then(response => {
           if (response.data.state == 0) {
             this.WarehouseInfo.loading = false
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.WarehouseInfo.loading = false
             this.total = response.data.data.total
             for (let i = 0; i < response.data.data.list.length; i++) {
-              if(response.data.data.list[i].query_warehousing_info.length > 0){
+              if (response.data.data.list[i].query_warehousing_info.length > 0) {
                 this.WarehouseInfo.warehouseInfoDate.push(response.data.data.list[i])
-              }else{
-                this.total = this.total -1
+              } else {
+                this.total = this.total - 1
               }
             }
           }
-        });
-      }, getSpecificationName: function (id) {
+        })
+      }, getSpecificationName: function(id) {
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == id) {
@@ -155,7 +163,7 @@
           }
         }
         return name
-      }, getTypeName: function (id) {
+      }, getTypeName: function(id) {
         let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == id) {
@@ -163,85 +171,83 @@
           }
         }
         return name
-      }, GetAllGoodType: function () {
+      }, GetAllGoodType: function() {
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               this.goodType.push(response.data.data.goodType[i])
             }
           }
-        });
-      }, GetAllGoodInfo: function () {
+        })
+      }, GetAllGoodInfo: function() {
         GetAllGoodInfo().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             for (let i = 0; i < response.data.data.goodInfo.length; i++) {
               this.goodInfo.push(response.data.data.goodInfo[i])
             }
           }
-        });
-      }, handleBack: function () {
+        })
+      }, handleBack: function() {
         this.$router.go(-1)
       }, handleSizeChange(val) {
-        this.limit = val;
-        this.GetAllStockQuery();
+        this.limit = val
+        this.GetAllStockQuery()
       }, handleCurrentChange(val) {
-        this.page = val;
-        this.GetAllStockQuery();
-      }, calculate: function (val) {
+        this.page = val
+        this.GetAllStockQuery()
+      }, calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
-      }, startTimeChange: function () {
+      }, startTimeChange: function() {
         this.GetAllStockQuery()
-      }, endTimeChange: function () {
+      }, endTimeChange: function() {
         this.GetAllStockQuery()
 
-      },stockInCount:function (row) {
+      }, stockInCount: function(row) {
         let total = 0
-        for(let i = 0; i < row.query_warehousing_info.length; i++ ){
-          total =   total+  row.query_warehousing_info[i].warehousing_count
+        for (let i = 0; i < row.query_warehousing_info.length; i++) {
+          total = total + row.query_warehousing_info[i].warehousing_count
         }
         return total
 
-      },salesReturnCount:function (row) {
+      }, salesReturnCount: function(row) {
         let total = 0
-        for(let i = 0; i < row.query_sales_return_info.length; i++ ){
+        for (let i = 0; i < row.query_sales_return_info.length; i++) {
           total = total + row.query_sales_return_info[i].count
         }
         return total
 
-      },stockOutCount:function (row) {
+      }, stockOutCount: function(row) {
         let total = 0
-        for(let i = 0; i < row.query_warehouseout_info.length; i++ ){
-          total =   total+  row.query_warehouseout_info[i].count
+        for (let i = 0; i < row.query_warehouseout_info.length; i++) {
+          total = total + row.query_warehouseout_info[i].count
         }
         return total
 
-      },cancelStockCount:function (row) {
+      }, cancelStockCount: function(row) {
         let total = 0
-        for(let i = 0; i < row.query_cancel_stock_info.length; i++ ){
-          total =   total+  row.query_cancel_stock_info[i].count
+        for (let i = 0; i < row.query_cancel_stock_info.length; i++) {
+          total = total + row.query_cancel_stock_info[i].count
         }
         return total
-      },showStockInDetailDialog:function (val) {
+      }, showStockInDetailDialog: function(val) {
 
+      }, showSaleReturnDetailDialog: function() {
 
-      },showSaleReturnDetailDialog:function () {
-
-
-      },showStockOutDetailDialog:function () {
-
-
-      },showCancelStockDetailDialog:function () {
+      }, showStockOutDetailDialog: function() {
 
+      }, showCancelStockDetailDialog: function() {
 
+      },search:function() {
+        this.GetAllStockQuery()
       }
     }
-  };
+  }
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
@@ -249,10 +255,11 @@
     border: 1px #dcdfe6 solid;
     padding: 30px 20px 30px 20px;
 
-    .border {
-      border-bottom: 1px #dcdfe6 solid;
-      margin: 0px 0 20px 0;
-    }
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
   }
 
   .title {
@@ -262,7 +269,6 @@
     padding: 0 0 0 10px;
     color: #fff;
     margin: 0 0 10px 0;
-    // border-radius: 4px 4px 0 0;
   }
 
   .edit_separater {