修改库存管理

src/api/stock.js

@@ -251,9 +251,9 @@ export function GetAllGoodInfo(params){
   })
 }
 
-export function postWarehouse(params,warehousing_time,warehousing_order){
+export function postWarehouse(params,warehousing_time,manufacturer_id,dealer_id){
   return request({
-    url:'/api/stock/warehouse/create?warehousing_time='+warehousing_time+"&warehousing_order="+warehousing_order,
+    url:'/api/stock/warehouse/create?warehousing_time='+warehousing_time+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
     method:'post',
     data:params
   })
@@ -277,9 +277,9 @@ export function getWarehouseInfoList(params){
 }
 
 
-export function postSalesReturn(params,salesReturnTime,salesReturnTotal,ids,orderNumber){
+export function postSalesReturn(params,salesReturnTime,salesReturnTotal,dealer_id,manufacturer_id){
   return request({
-    url:'/api/warehouse/return?time='+salesReturnTime+"&total="+salesReturnTotal+"&ids="+ids+"&order_number="+orderNumber,
+    url:'/api/warehouse/return?time='+salesReturnTime+"&total="+salesReturnTotal+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id,
     method:'post',
     data:params
   })
@@ -324,15 +324,6 @@ export function getAllWarehouseInfo(params){
 
 
 
-
-export function getWarehouseOutList(params){
-  return request({
-    url:'/api/stock/out/list',
-    method:'get',
-    params:params
-  })
-}
-
 export function getWarehouseOutInfoList(params){
   return request({
     url:'/api/stock/out/info',
@@ -342,9 +333,9 @@ export function getWarehouseOutInfoList(params){
 }
 
 
-export function postWarehouseOut(params,warehousing_time,warehousing_out_order){
+export function postWarehouseOut(params,warehousing_time,dealer_id,manufacturer_id){
   return request({
-    url:'/api/stock/out/create?warehousing_out_time='+warehousing_time+"&warehousing_out_order="+warehousing_out_order,
+    url:'/api/warehouseout/create?warehousing_out_time='+warehousing_time+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id,
     method:'post',
     data:params
   })
@@ -367,33 +358,9 @@ export function getWarehouseInfoByGoodTypeId(params){
   })
 }
 
-export function getWarehouseOutInfo(params){
-  return request({
-    url:'/api/out/info',
-    method:'get',
-    params:params
-  })
-}
-
 
-export function postCancelStock(params,cancelStockTime,cancelStockTotal,ids,orderNumber){
-  return request({
-    url:'/api/stock/cancel?time='+cancelStockTime+"&total="+cancelStockTotal+"&ids="+ids+"&order_number="+orderNumber,
-    method:'post',
-    data:params
-  })
-}
 
 
-
-export function getCancelStockList(params){
-  return request({
-    url:'/api/cancel/list',
-    method:'get',
-    params:params
-  })
-}
-
 export function getCancelStockInfoList(params){
   return request({
     url:'/api/cancel/info',
@@ -467,30 +434,208 @@ export function modifyWarehouseOutInfo(params){
 }
 
 
+
+
+
+export function deleteStockInRecord(params){
+  return request({
+    url:'/api/warehouse/delete',
+    method:'post',
+    params:params
+  })
+}
+
+
+export function GetAllConfig(){
+  return request({
+    url:'/api/stock/config',
+    method:'get',
+  })
+}
+
+export function GetAllGoodInfoByID(params){
+  return request({
+    url:'/api/good/get',
+    method:'get',
+    params:params
+
+  })
+}
+
+
+export function DeleteWarehouseInfoItem(params){
+  return request({
+    url:'/api/stock/warehouseinfo/delete',
+    method:'post',
+    params:params
+
+  })
+}
+
+
+
+export function EditWarehouse(params,warehousing_time,id){
+  return request({
+    url:'/api/stock/warehouse/edit?warehousing_time='+warehousing_time+'&id='+id,
+    method:'post',
+    data:params
+  })
+}
+
+
+export function getSalesReturnConfig(){
+  return request({
+    url:'/api/return/config',
+    method:'get',
+  })
+}
+
+export function deleteSalesReturn(params){
+  return request({
+    url:'/api/return/delete',
+    method:'post',
+    params:params
+  })
+}
+
+
+export function getSaleReturnInfoList(params){
+  return request({
+    url:'/api/stock/salesReturn/list',
+    method:'get',
+    params:params
+  })
+}
+
+
+export function getReturnList(params){
+  return request({
+    url:'/api/return/info/list',
+    method:'get',
+    params:params
+  })
+}
+export function deleteSalesReturnInfo(params){
+  return request({
+    url:'/api/return/info/delete',
+    method:'post',
+    params:params
+  })
+}
+
+
+
+export function editSalesReturnInfo(params,return_time,id){
+  return request({
+    url:'/api/return/edit?return_time='+return_time+"&id="+id,
+    method:'post',
+    data:params
+  })
+}
+
+
+export function deleteWarehouseOut(params){
+  return request({
+    url:'/api/warehouseout/delete',
+    method:'post',
+    params:params
+  })
+}
+
 export function deleteWarehouseOutInfo(params){
   return request({
-    url:'/api/stock/out/delete',
+    url:'/api/warehouseoutinfo/delete',
     method:'post',
     params:params
   })
 }
 
 
-export function deleteStockInRecord(params){
+export function getWarehouseOutList(params){
   return request({
-    url:'/api/warehouse/delete',
+    url:'/api/warehouseout/list',
+    method:'get',
+    params:params
+  })
+}
+
+export function getWarehouseOutInfo(params){
+  return request({
+    url:'/api/warehouseout/info',
+    method:'get',
+    params:params
+  })
+}
+
+
+export function editWarehouseoutInfo(params,warehouse_out_time,id){
+  return request({
+    url:'/api/warehouseout/edit?warehouse_out_time='+warehouse_out_time+"&id="+id,
     method:'post',
+    data:params
+  })
+}
+
+
+
+
+export function getCancelStockList(params){
+  return request({
+    url:'/api/cancelstock/list',
+    method:'get',
     params:params
   })
 }
 
 
 
+export function editCancelStockInfo(params,cancel_stock_time,id){
+  return request({
+    url:'/api/cancelstockinfo/edit?cancel_time='+cancel_stock_time+"&id="+id,
+    method:'post',
+    data:params
+  })
+}
+
 
+export function getCancelStockInfo(params){
+  return request({
+    url:'/api/cancelstock/info',
+    method:'get',
+    params:params
+  })
+}
 
 
 
+export function deleteCancelStock(params){
+  return request({
+    url:'/api/cancelstock/delete',
+    method:'post',
+    params:params
+  })
+}
 
+export function deleteCancelStockInfo(params){
+  return request({
+    url:'/api/cancelstockinfo/delete',
+    method:'post',
+    params:params
+  })
+}
 
+export function postCancelStock(params,cancelStockTime,manufacturer_id,dealer_id){
+  return request({
+    url:'/api/cancelstock/create?time='+cancelStockTime+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    method:'post',
+    data:params
+  })
+}
+export function getCancelStockConfig(){
+  return request({
+    url:'/api/cancelstockinfo/config',
+    method:'get',
+  })
+}
 
 

src/lang/zh.js

@@ -136,6 +136,16 @@ export default {
     special_permission_manage: "特殊权限管理",
     schedule_print: "排班打印",
     dialysis_batch_print: "批量打印",
+    stockInOrder:"入库单",
+    salesReturnOrder:"退货单",
+    stockOutOrder:"出库单",
+    cancelStockOrder:"出库退库单",
+    otherStockInOrder:"其他入库单",
+    otherSalesReturnOrder:"其退货单",
+    otherStockOutOrder:"其他出库单",
+    otherCancelStockOrder:"其他出库退库单",
+
+
   },
   navbar: {
     logOut: '退出登录',
@@ -198,7 +208,7 @@ export default {
     draft: '草稿',
     delete: '删除',
     cancel: '取 消',
-    confirm: '确 定'
+    confirm: '保 存'
   },
   errorLog: {
     tips: '请点击右上角bug小图标',

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -1,11 +1,174 @@
 <template>
+  <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <div class="filter-container">
+      <el-input style="width: 150px;" class="filter-item" placeholder="规格名称" v-model="keywords"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-table
+          :data="propForm.goodType"
+          ref="templatetable"
+          border
+          highlight-current-row
+          max-height="250"
+          @current-change="goodTypeTableChange"
+          style="width: 100%">
+          <el-table-column
+            prop="type_name"
+            label="商品类型">
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :span="16">
+        <el-table
+          :data="goodInfoTableData"
+          border
+          ref="multipleTable"
+          max-height="250"
+          @selection-change="changeGoodInfoTableData"
+          @select-all="changeAllGoodInfoTableData"
+          row-key="row_key"
+          style="width: 100%"
+        >
+          <el-table-column
+            type="selection"
+            width="55">
+          </el-table-column>
+          <el-table-column
+            label="规格名称"
+            property="specification_name"
+            style="word-break: keep-all;white-space:nowrap;"
+          ></el-table-column>
+          <el-table-column
+            label="单位"
+            property="good_unit"
+          >
+            <template slot-scope="scope">
+              <span>{{getName(scope.row.good_unit)}}</span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-col>
+    </el-row>
+
+
+    <span slot="footer" class="dialog-footer">
+    <el-button @click="cancle()">取 消</el-button>
+    <el-button type="primary" @click="comfirm()">确 定</el-button>
+  </span>
+  </el-dialog>
 
 </template>
 
 <script>
-    export default {
-        name: "sales-return-dialog"
+
+  export default {
+    name: 'salesReturnDialog',
+    data() {
+      return {
+        goodInfo: [],
+        goodInfoTableData: [],
+        keywords: '',
+        multipleSelection: [],
+        currentGoodTypeId: 0,
+        isClose : false
+      }
+    },
+    props: {
+      propForm: {
+        type: Object
+      },
+      visibility: {
+        type: Boolean,
+        default: false
+      }
+
+    },
+    methods: {
+      goodTypeTableChange: function(currentRow, oldCurrentRow) {
+        this.currentGoodTypeId = currentRow.id
+
+        this.goodInfoTableData = []
+        this.goodInfo = []
+        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();
+      },
+      comfirm: function() {
+        this.$emit('dialog-comfirm', this.getValue())
+        this.$refs.multipleTable.clearSelection();
+
+      },
+      getValue: function() {
+        let obj = {
+          selectedGoodInfo: this.multipleSelection,
+          goodTypeId: this.currentGoodTypeId
+        }
+        return obj
+      }, goodTypeSelect: function(id) {
+
+        this.tempGoodInfo = []
+        this.goodInfo = []
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.propForm.goodInfo[i].good_type_id == id) {
+            this.tempGoodInfo.push(this.propForm.goodInfo[i])
+          }
+        }
+      }, goodInfoSelect: function(id) {
+        let index = 0
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.propForm.goodInfo[i].id == id) {
+            index = i
+          }
+        }
+        this.form.good_type_id = this.propForm.goodInfo[index].good_type_id
+      }, getName: function(id) {
+        if (id == 0) {
+          return ''
+        }
+
+        for (let i = 0; i < this.propForm.goodUnit.length; i++) {
+          if (this.propForm.goodUnit[i].id == id) {
+            return this.propForm.goodUnit[i].name
+          }
+        }
+      }, search: function() {
+        if (this.keywords.length <= 0) {
+          this.$message.error('搜索关键字不能为空')
+          return
+        }
+        let searchArr = []
+        for (let i = 0; i < this.goodInfoTableData.length; i++) {
+          if (this.goodInfoTableData[i].specification_name.indexOf(this.keywords) != -1) {
+            searchArr.push(this.goodInfoTableData[i])
+          }
+        }
+        this.goodInfoTableData = []
+        for (let i = 0; i < searchArr.length; i++) {
+          this.goodInfoTableData.push(searchArr[i])
+        }
+      }, changeGoodInfoTableData: function(val) {
+        this.multipleSelection = val
+
+      }, changeAllGoodInfoTableData: function(val) {
+        this.multipleSelection = val
+
+      }
     }
+  }
+
 </script>
 
 <style scoped>

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -2,142 +2,82 @@
   <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
-    <el-form  class="demo-form-inline" style="height: 300px"
-              :rules="rules" :model="form" ref="form"
-             label-width="140px">
-      <el-col :span="size">
-        <el-form-item label="物品类型:" prop="good_type_id">
-          <el-select v-model="form.good_type_id" placeholder="请选择"     @change="goodTypeSelect"
-          >
-            <el-option
-              v-for="item in tempGoodType"
-              :key="item.id"
-              :label="item.type_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-
-      <el-col :span="size">
-        <el-form-item label="规格名称:" prop="good_id">
-          <el-select v-model="form.good_id" placeholder="请选择"  @change="goodInfoSelect">
-            <el-option
-              v-for="item in tempGoodInfo"
-
-              :key="item.id"
-              :label="item.specification_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="size">
-        <el-form-item label="批号:" prop="number">
-          <el-input v-model="form.number"></el-input>
-        </el-form-item>
-      </el-col>
-
-
-      <el-col :span="size">
-        <el-form-item label="生产日期:" prop="product_date">
-          <el-date-picker v-model="form.product_date" prefix-icon="el-icon-date" :editable="false"
-                          style="width: 173px;"
-                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"></el-date-picker>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="size">
-
-        <el-form-item label="有效日期:" prop="expiry_date">
-          <el-date-picker v-model="form.expiry_date" prefix-icon="el-icon-date" :editable="false"
-                          style="width: 173px;"
-                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"></el-date-picker>
-        </el-form-item>
-
-
-      </el-col>
-
-
-      <el-col :span="size">
-        <el-form-item label="入库数量:" prop="warehousing_count">
-          <el-input type="number" v-model="form.warehousing_count"></el-input>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="size">
-        <el-form-item label="物品单价:" prop="price">
-          <el-input type="number"  v-model="form.price"></el-input>
-        </el-form-item>
+    <div class="filter-container">
+      <el-input style="width: 150px;" class="filter-item" placeholder="规格名称" v-model="keywords"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-table
+          :data="propForm.goodType"
+          ref="templatetable"
+          border
+          highlight-current-row
+          max-height="250"
+          @current-change="goodTypeTableChange"
+          style="width: 100%">
+          <el-table-column
+            prop="type_name"
+            label="商品类型">
+          </el-table-column>
+        </el-table>
       </el-col>
+      <el-col :span="16">
+        <el-table
+          :data="goodInfoTableData"
+          border
+          ref="multipleTable"
+          max-height="250"
+          @selection-change="changeGoodInfoTableData"
+          @select-all="changeAllGoodInfoTableData"
+          row-key="row_key"
+          style="width: 100%"
+        >
+          <el-table-column
+            type="selection"
+            width="55">
+          </el-table-column>
+          <el-table-column
+            label="规格名称"
+            property="specification_name"
+            style="word-break: keep-all;white-space:nowrap;"
+          ></el-table-column>
+          <el-table-column
+            label="单位"
+            property="good_unit"
+          >
+            <template slot-scope="scope">
+              <span>{{getName(scope.row.good_unit)}}</span>
+            </template>
+          </el-table-column>
 
-      <el-col>
-        <el-form-item label="备注 : " prop="remark">
-          <el-input type="textarea" :row="5" v-model="form.remark"
-                    placeholder="请输入内容">
-          </el-input>
-        </el-form-item>
+        </el-table>
       </el-col>
-    </el-form>
+    </el-row>
 
 
     <span slot="footer" class="dialog-footer">
-    <el-button v-if="propForm.isCreated == 3" @click="cancle('form')">取 消</el-button>
-    <el-button v-if="propForm.isCreated != 3 " @click="cancle('form')">取 消</el-button>
-    <el-button v-if="propForm.isCreated != 3" type="primary" @click="comfirm('form')">确 定</el-button>
+    <el-button @click="cancle('form')">取 消</el-button>
+    <el-button type="primary" @click="comfirm('form')">确 定</el-button>
   </span>
   </el-dialog>
 
 </template>
 
 <script>
+  import { GetGoodInfoByGoodId } from '@/api/stock'
+
   export default {
-    name: "stockInDialog",
+    name: 'stockInDialog',
     data() {
       return {
-        form:{
-          good_type_id: '',
-          good_id: '',
-          number: '',
-          product_date: '',
-          expiry_date: '',
-          warehousing_count: '',
-          price: '',
-          remark: '',
-          dealer: '',
-          manufacturer: '',
-        },
-        tempGoodType: [],
-        tempGoodInfo: [],
-        isClose: false,
-        size: 11,
-        isShow: true,
-        rules: {
-          good_id: [
-            {required: true, message: '请选择物品类型', trigger: 'change'}
-          ],
-          good_type_id: [
-            {required: true, message: '请选择规格名称', trigger: 'change'}
-          ],
-          number: [
-            {required: true, message: '请输入批号', trigger: 'blur'}
-          ],
-          expiry_date: [
-            {required: true, message: '请选择日期', trigger: 'change'}
-          ],
-          warehousing_count: [
-            {required: true, message: '请选择入库数量', trigger: 'blur'}
-          ],
-          price: [
-            {required: true, message: '请选择物品单价', trigger: 'blur'}
-          ],
-
-
-        }
+        goodInfo: [],
+        goodInfoTableData: [],
+        keywords: '',
+        multipleSelection: [],
+        currentGoodTypeId: 0,
+        isClose : false
       }
     },
     props: {
@@ -147,90 +87,93 @@
       visibility: {
         type: Boolean,
         default: false
-      },
+      }
 
     },
     methods: {
-      cancle: function (formName) {
-        this.$emit('dialog-cancle', this.getValue());
-        this.$refs[formName].resetFields();
-      },
-      comfirm: function (formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            this.$emit('dialog-comfirm', this.getValue());
-
-          }
-        });
-      },
-      getValue: function () {
-        let form = {}
-        form['good_type_id'] = this.form.good_type_id
-        form['good_id'] = this.form.good_id
-        form['number'] = this.form.number
-        form['product_date'] = this.form.product_date
-        form['expiry_date'] = this.form.expiry_date
-        form['warehousing_count'] = this.form.warehousing_count
-        form['price'] = this.form.price
-        if(this.form.remark == undefined){
-          form['remark'] = ""
-        }else{
-          form['remark'] = this.form.remark
+      goodTypeTableChange: function(currentRow, oldCurrentRow) {
+        this.currentGoodTypeId = currentRow.id
+        let params = {
+          id: currentRow.id
         }
-
-        console.log(form['remark'])
-        form['isCreated'] = this.propForm.isCreated
-        for(let i = 0; i <this.propForm.goodInfo.length; i++){
-
-          if(this.propForm.goodInfo[i].id == this.propForm.formValue.good_id){
-
-            form['dealer'] = this.propForm.goodInfo[i].dealer
-            form['manufacturer'] = this.propForm.goodInfo[i].manufacturer
+        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])
+            }
           }
-        }
+        })
 
+      },
+      cancle: function(formName) {
+        this.$emit('dialog-cancle', this.getValue())
+        this.$refs.multipleTable.clearSelection();
+      },
+      comfirm: function(formName) {
+        this.$emit('dialog-comfirm', this.getValue())
+        this.$refs.multipleTable.clearSelection();
 
-        return form
-      }, goodTypeSelect: function (id) {
+      },
+      getValue: function() {
+        let obj = {
+          selectedGoodInfo: this.multipleSelection,
+          goodTypeId: this.currentGoodTypeId
+        }
+        return obj
+      }, goodTypeSelect: function(id) {
 
         this.tempGoodInfo = []
+        this.goodInfo = []
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].good_type_id == id) {
             this.tempGoodInfo.push(this.propForm.goodInfo[i])
           }
         }
-      }, goodInfoSelect: function (id) {
-        let index = 0;
+      }, goodInfoSelect: function(id) {
+        let index = 0
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].id == id) {
             index = i
           }
         }
         this.form.good_type_id = this.propForm.goodInfo[index].good_type_id
-      }
-    },
-    watch: {
-      visibility(val) {
-        this.form = this.propForm.formValue
-        this.tempGoodInfo = this.propForm.goodInfo
-        this.tempGoodType = this.propForm.goodType
-        if(!val) {
-          this.form.good_type_id = ''
-          this.form.good_id = ''
-          this.form.number = ''
-          this.form.product_date = ''
-          this.form.expiry_date = ''
-          this.form.warehousing_count = ''
-          this.form.product_date = ''
-          this.form.price = ''
-          this.form.remark = ''
+      }, getName: function(id) {
+        if (id == 0) {
+          return ''
+        }
 
+        for (let i = 0; i < this.propForm.goodUnit.length; i++) {
+          if (this.propForm.goodUnit[i].id == id) {
+            return this.propForm.goodUnit[i].name
+          }
+        }
+      }, search: function() {
+        if (this.keywords.length <= 0) {
+          this.$message.error('搜索关键字不能为空')
+          return
+        }
+        let searchArr = []
+        for (let i = 0; i < this.goodInfoTableData.length; i++) {
+          if (this.goodInfoTableData[i].specification_name.indexOf(this.keywords) != -1) {
+            searchArr.push(this.goodInfoTableData[i])
+          }
+        }
+        this.goodInfoTableData = []
+        for (let i = 0; i < searchArr.length; i++) {
+          this.goodInfoTableData.push(searchArr[i])
         }
-        !val && setTimeout(() => {
-          this.$refs['form'].resetFields();
+      }, changeGoodInfoTableData: function(val) {
+        this.multipleSelection = val
 
+      }, changeAllGoodInfoTableData: function(val) {
+        this.multipleSelection = val
 
-        }, 0);
       }
     }
   }

src/xt_pages/stock/cancelStockDetail.vue

@@ -0,0 +1,23 @@
+<template>
+  <cancel-stock-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></cancel-stock-order-detail>
+  <cancel-stock-order-edit v-else></cancel-stock-order-edit>
+</template>
+
+<script>
+  import CancelStockOrderDetail from './cancelStockOrderDetail'
+  import CancelStockOrderEdit from './cancelStockOrderEdit'
+  export default {
+    name: 'cancelStockDetail',
+    components: { CancelStockOrderEdit, CancelStockOrderDetail },
+    data() {
+      return {
+        isEdit: 0
+      }
+    },
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/cancelStockOrder.vue

@@ -0,0 +1,406 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+
+    <div class="filter-container">
+
+
+      <el-row style="float:right;">
+        <el-button @click="AddNewOrder" type="primary">新增</el-button>
+      </el-row>
+    </div>
+
+    <div class="filter-container" style="margin-top:20px">
+      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <div class="filter-container">
+      <span>入库时间:</span>
+      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+      <span class="">-</span>
+      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+      <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="cancelStockDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%" border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+
+      >
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.return_time | parseTime('{y}-{m}-{d}')}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.order_number}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{getXuserName(scope.row.creater)}}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="厂家" align="center">
+          <template slot-scope="scope">
+            {{getManufactuerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="经销商" align="center">
+          <template slot-scope="scope">
+            {{getDealerName(scope.row.dealer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+
+          </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,
+    getCancelStockList,
+  } from '@/api/stock'
+
+  export default {
+    name: 'salesReturnOrder',
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: [],
+
+      }
+    },
+    methods: {
+      AddNewOrder:function(){
+        this.$router.push({ name: 'cancelStockOrderAdd'})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time
+        }
+        this.cancelStockDate = []
+        getCancelStockList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetWarehouse()
+      }, endTimeChange(val) {
+        this.GetWarehouse()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -0,0 +1,407 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                         :visibility="isVisibility"
+                         v-on:dialog-comfirm="comfirm"
+                         v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8"><div>
+          <span>退货时间:</span>
+          <el-date-picker v-model="return_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"></el-date-picker>
+        </div></el-col>
+
+
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
+              <el-form-item label="厂商：" prop="manufacturer">
+                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
+                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" label-width="80px">
+              <el-form-item label="经销商：">
+                <el-select v-model="form.dealer" placeholder="请选择经销商">
+                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+      </el-row>
+
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope" >
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>退库数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--{{scope.row.warehousing_count}}-->
+                <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.return_count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import {
+    getCancelStockConfig,
+    postCancelStock,
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog},
+    name: 'salesReturnOrderAdd',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        return_time: '',
+        currentIndex: 0,
+        recordInfo: {
+          recordData: [],
+        },
+        tableRules: {
+          return_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+        },
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getCancelStockConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseOutList =  response.data.data.warehouseOutList
+            var warehouseOutInfoList =  response.data.data.warehouseOutInfoList
+            for (let i = 0; i <warehouseOutList.length; i++ ){
+              if(warehouseOutList[i].Manufacturer.id > 0){
+                this.manufacturer.push(warehouseOutList[i].Manufacturer)
+              }
+              if(warehouseOutList[i].Dealer.id > 0){
+                this.dealer.push(warehouseOutList[i].Dealer)
+              }
+            }
+
+            for (let i = 0; i < warehouseOutInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
+
+            }
+
+
+            const obj = {}
+            const obj2 = {}
+            const obj4 = {}
+            //去重复
+            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            //去重复
+            this.dealer =  this.dealer.reduce((cur, next) => {
+              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+
+
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        this.recordInfo.recordData.splice(index, 1)
+      }, calculate: function(val) {
+
+        if (val == 0) {
+          return ''
+        }
+
+        return Math.round(parseFloat(val) * 100) / 100
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+          this.$message.error('请先选择厂商')
+          return
+        } else {
+          this.isVisibility = true
+          console.log(this.form.manufacturer)
+          for (let i = 0; i < this.propForm.goodInfo.length; i++){
+            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
+              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+            }
+
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+
+
+
+        }
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            if (this.form.manufacturer == 0) {
+              this.$message.error('厂商不能为空')
+              return
+            }
+            const array = this.recordInfo.recordData
+            let total = 0
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+              total = total + array[i].price * array[i].return_count
+            }
+            const params = {
+              'cancelStock': this.recordInfo.recordData
+            }
+            postCancelStock(params,this.return_time,this.form.manufacturer,this.form.dealer).then(response=>{
+              if (response.data.state==0) {
+                this.$message.error(response.data.msg);
+                return false;
+              }else {
+                this.$notify({
+                  title: "成功",
+                  message: "退货成功",
+                  type: "success",
+                  duration: 2000
+                });
+                this.recordInfo.recordData = []
+                this.$router.back(-1)
+              }
+            });
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.return_time = endTime
+      const tempObj = {}
+      tempObj['good_type_id'] = 0
+      tempObj['good_id'] = 0
+      tempObj['return_count'] = ''
+      this.recordInfo.recordData.push(tempObj)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -0,0 +1,232 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <div class="filter-container">
+      <span style="font-size: 20px">退货单详情</span>
+      <el-row style="float:right;">
+        <span>{{CancelStockInfo.cancelStock.order_number}}</span>
+      </el-row>
+    </div>
+
+
+
+    <div class="filter-container">
+      <span>单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span>厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
+      <span>经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
+      <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="CancelStockInfo.cancelStockInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+      >
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>物品类型</span>
+          </template>
+
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>规格名称</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>退货数量</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.count}}</span>
+
+          </template>
+        </el-table-column>
+
+
+      </el-table>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { GetAllConfig,getCancelStockInfo,deleteCancelStock } from '@/api/stock'
+
+  export default {
+    name: 'cancelStockOrderDetail',
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        CancelStockInfo: {
+          loading: false,
+          cancelStockInfoData: [],
+          cancelStock: {}
+        }
+      }
+    },
+    methods: {
+      getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getCancelStockInfo(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.CancelStockInfo.cancelStockInfoData.push(response.data.data.list[i])
+            }
+            this.CancelStockInfo.cancelStock = response.data.data.info
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.CancelStockInfo.cancelStock.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -0,0 +1,391 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                         :visibility="isVisibility"
+                         v-on:dialog-comfirm="comfirm"
+                         v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8">
+          <div>
+            <span>入库时间:</span>
+            <el-date-picker v-model="return_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"></el-date-picker>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                            :value="typeName(scope.row.good_type_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                            :value="specificationName(scope.row.good_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>退货数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                              style="padding-top: 17px">
+                  <el-input type="number" v-model="scope.row.count"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  import {
+    deleteCancelStockInfo,
+    getCancelStockInfo,
+    getCancelStockConfig,
+    editCancelStockInfo
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog },
+    name: 'cancelStockOrderEdit',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+        return_time: '',
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库'
+        },
+
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        cancelStock: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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['id'] = 0
+              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_id'] = val.selectedGoodInfo[i].id
+              tempForm['count'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getCancelStockConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseOutInfoList = response.data.data.warehouseOutInfoList
+            for (let i = 0; i < warehouseOutInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
+              this.propForm.goodType.push(warehouseOutInfoList[i].GoodInfo.GoodsType)
+
+            }
+            const obj3 = {}
+            const obj4 = {}
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['count'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该退库物品信息记录?', '删除退库物品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteCancelStockInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '删除成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+
+        this.isVisibility = true
+        console.log(this.form.manufacturer)
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
+            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+          }
+        }
+        const obj3 = {}
+        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'cancelStock': this.recordInfo.recordData
+            }
+            editCancelStockInfo(params, this.return_time, this.$route.query.id).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '退库成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getCancelStockInfo(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++) {
+              response.data.data.list[i].count =  response.data.data.list[i].count.toString();
+              this.recordInfo.recordData.push(response.data.data.list[i])
+            }
+            this.cancelStock = response.data.data.info
+            this.return_time = this.getTime(this.cancelStock.return_time, '{y}-{m}-{d}')
+            this.form.manufacturer = this.cancelStock.manufacturer
+            this.form.dealer = this.cancelStock.dealer
+          }
+        })
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/otherCancelStockDetail.vue

@@ -0,0 +1,25 @@
+<template>
+  <other-cancel-stock-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></other-cancel-stock-order-detail>
+  <other-cancel-stock-order-edit v-else></other-cancel-stock-order-edit>
+</template>
+
+<script>
+  import CancelStockOrderDetail from './cancelStockOrderDetail'
+  import CancelStockOrderEdit from './cancelStockOrderEdit'
+  import OtherCancelStockOrderDetail from './otherCancelStockOrderDetail'
+  import OtherCancelStockOrderEdit from './otherCancelStockOrderEdit'
+  export default {
+    name: 'cancelStockDetail',
+    components: { OtherCancelStockOrderEdit, OtherCancelStockOrderDetail },
+    data() {
+      return {
+        isEdit: 0
+      }
+    },
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -0,0 +1,406 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+
+    <div class="filter-container">
+
+
+      <el-row style="float:right;">
+        <el-button @click="AddNewOrder" type="primary">新增</el-button>
+      </el-row>
+    </div>
+
+    <div class="filter-container" style="margin-top:20px">
+      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <div class="filter-container">
+      <span>入库时间:</span>
+      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+      <span class="">-</span>
+      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+      <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="cancelStockDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%" border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+
+      >
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.return_time | parseTime('{y}-{m}-{d}')}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.order_number}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{getXuserName(scope.row.creater)}}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="厂家" align="center">
+          <template slot-scope="scope">
+            {{getManufactuerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="经销商" align="center">
+          <template slot-scope="scope">
+            {{getDealerName(scope.row.dealer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+
+          </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,
+    getCancelStockList,
+  } from '@/api/stock'
+
+  export default {
+    name: 'salesReturnOrder',
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: [],
+
+      }
+    },
+    methods: {
+      AddNewOrder:function(){
+        this.$router.push({ name: 'cancelStockOrderAdd'})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time
+        }
+        this.cancelStockDate = []
+        getCancelStockList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetWarehouse()
+      }, endTimeChange(val) {
+        this.GetWarehouse()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/otherCancelStockOrderAdd.vue

@@ -0,0 +1,407 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                         :visibility="isVisibility"
+                         v-on:dialog-comfirm="comfirm"
+                         v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8"><div>
+          <span>退货时间:</span>
+          <el-date-picker v-model="return_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"></el-date-picker>
+        </div></el-col>
+
+
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
+              <el-form-item label="厂商：" prop="manufacturer">
+                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
+                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" label-width="80px">
+              <el-form-item label="经销商：">
+                <el-select v-model="form.dealer" placeholder="请选择经销商">
+                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+      </el-row>
+
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope" >
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>退库数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--{{scope.row.warehousing_count}}-->
+                <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.return_count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import {
+    getCancelStockConfig,
+    postCancelStock,
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog},
+    name: 'salesReturnOrderAdd',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        return_time: '',
+        currentIndex: 0,
+        recordInfo: {
+          recordData: [],
+        },
+        tableRules: {
+          return_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+        },
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getCancelStockConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseOutList =  response.data.data.warehouseOutList
+            var warehouseOutInfoList =  response.data.data.warehouseOutInfoList
+            for (let i = 0; i <warehouseOutList.length; i++ ){
+              if(warehouseOutList[i].Manufacturer.id > 0){
+                this.manufacturer.push(warehouseOutList[i].Manufacturer)
+              }
+              if(warehouseOutList[i].Dealer.id > 0){
+                this.dealer.push(warehouseOutList[i].Dealer)
+              }
+            }
+
+            for (let i = 0; i < warehouseOutInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
+
+            }
+
+
+            const obj = {}
+            const obj2 = {}
+            const obj4 = {}
+            //去重复
+            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            //去重复
+            this.dealer =  this.dealer.reduce((cur, next) => {
+              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+
+
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        this.recordInfo.recordData.splice(index, 1)
+      }, calculate: function(val) {
+
+        if (val == 0) {
+          return ''
+        }
+
+        return Math.round(parseFloat(val) * 100) / 100
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+          this.$message.error('请先选择厂商')
+          return
+        } else {
+          this.isVisibility = true
+          console.log(this.form.manufacturer)
+          for (let i = 0; i < this.propForm.goodInfo.length; i++){
+            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
+              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+            }
+
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+
+
+
+        }
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            if (this.form.manufacturer == 0) {
+              this.$message.error('厂商不能为空')
+              return
+            }
+            const array = this.recordInfo.recordData
+            let total = 0
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+              total = total + array[i].price * array[i].return_count
+            }
+            const params = {
+              'cancelStock': this.recordInfo.recordData
+            }
+            postCancelStock(params,this.return_time,this.form.manufacturer,this.form.dealer).then(response=>{
+              if (response.data.state==0) {
+                this.$message.error(response.data.msg);
+                return false;
+              }else {
+                this.$notify({
+                  title: "成功",
+                  message: "退货成功",
+                  type: "success",
+                  duration: 2000
+                });
+                this.recordInfo.recordData = []
+                this.$router.back(-1)
+              }
+            });
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.return_time = endTime
+      const tempObj = {}
+      tempObj['good_type_id'] = 0
+      tempObj['good_id'] = 0
+      tempObj['return_count'] = ''
+      this.recordInfo.recordData.push(tempObj)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/otherCancelStockOrderDetail.vue

@@ -0,0 +1,232 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <div class="filter-container">
+      <span style="font-size: 20px">退货单详情</span>
+      <el-row style="float:right;">
+        <span>{{CancelStockInfo.cancelStock.order_number}}</span>
+      </el-row>
+    </div>
+
+
+
+    <div class="filter-container">
+      <span>单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span>厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
+      <span>经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
+      <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="CancelStockInfo.cancelStockInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+      >
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>物品类型</span>
+          </template>
+
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>规格名称</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>退货数量</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.count}}</span>
+
+          </template>
+        </el-table-column>
+
+
+      </el-table>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { GetAllConfig,getCancelStockInfo,deleteCancelStock } from '@/api/stock'
+
+  export default {
+    name: 'cancelStockOrderDetail',
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        CancelStockInfo: {
+          loading: false,
+          cancelStockInfoData: [],
+          cancelStock: {}
+        }
+      }
+    },
+    methods: {
+      getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getCancelStockInfo(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.CancelStockInfo.cancelStockInfoData.push(response.data.data.list[i])
+            }
+            this.CancelStockInfo.cancelStock = response.data.data.info
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.CancelStockInfo.cancelStock.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/otherCancelStockOrderEdit.vue

@@ -0,0 +1,391 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                         :visibility="isVisibility"
+                         v-on:dialog-comfirm="comfirm"
+                         v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8">
+          <div>
+            <span>入库时间:</span>
+            <el-date-picker v-model="return_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"></el-date-picker>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                            :value="typeName(scope.row.good_type_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                            :value="specificationName(scope.row.good_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>退货数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                              style="padding-top: 17px">
+                  <el-input type="number" v-model="scope.row.count"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  import {
+    deleteCancelStockInfo,
+    getCancelStockInfo,
+    getCancelStockConfig,
+    editCancelStockInfo
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog },
+    name: 'cancelStockOrderEdit',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+        return_time: '',
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库'
+        },
+
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        cancelStock: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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['id'] = 0
+              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_id'] = val.selectedGoodInfo[i].id
+              tempForm['count'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getCancelStockConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseOutInfoList = response.data.data.warehouseOutInfoList
+            for (let i = 0; i < warehouseOutInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseOutInfoList[i].GoodInfo)
+              this.propForm.goodType.push(warehouseOutInfoList[i].GoodInfo.GoodsType)
+
+            }
+            const obj3 = {}
+            const obj4 = {}
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['count'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该退库物品信息记录?', '删除退库物品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteCancelStockInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '删除成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+
+        this.isVisibility = true
+        console.log(this.form.manufacturer)
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
+            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+          }
+        }
+        const obj3 = {}
+        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'cancelStock': this.recordInfo.recordData
+            }
+            editCancelStockInfo(params, this.return_time, this.$route.query.id).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '退库成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getCancelStockInfo(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++) {
+              response.data.data.list[i].count =  response.data.data.list[i].count.toString();
+              this.recordInfo.recordData.push(response.data.data.list[i])
+            }
+            this.cancelStock = response.data.data.info
+            this.return_time = this.getTime(this.cancelStock.return_time, '{y}-{m}-{d}')
+            this.form.manufacturer = this.cancelStock.manufacturer
+            this.form.dealer = this.cancelStock.dealer
+          }
+        })
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/otherSalesReturnDetail.vue

@@ -0,0 +1,24 @@
+<template>
+  <other-sales-return-order-detaill v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></other-sales-return-order-detaill>
+  <other-sales-reuturn-order-edit v-else></other-sales-reuturn-order-edit>
+</template>
+
+<script>
+  import OtherSalesReturnOrderDetail from './otherSalesReturnOrderDetail'
+  import OtherSalesReturnOrderEdit from './otherSalesReturnOrderEdit'
+  export default {
+    name: 'otherSalesReturnDetail',
+    components: { OtherSalesReturnOrderEdit, OtherSalesReturnOrderDetail},
+    data() {
+      return {
+        isEdit: 0
+      }
+    }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -0,0 +1,408 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+
+    <div class="filter-container">
+
+
+      <el-row style="float:right;">
+        <el-button @click="AddNewOrder" type="primary">新增</el-button>
+      </el-row>
+    </div>
+
+    <div class="filter-container" style="margin-top:20px">
+      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <div class="filter-container">
+      <span>入库时间:</span>
+      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+      <span class="">-</span>
+      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+      <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="saleReturnDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%" border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+
+      >
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.opera_time | parseTime('{y}-{m}-{d}')}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.order_number}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{getXuserName(scope.row.creater)}}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="厂家" align="center">
+          <template slot-scope="scope">
+            {{getManufactuerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="经销商" align="center">
+          <template slot-scope="scope">
+            {{getDealerName(scope.row.dealer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+
+          </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 {
+    deleteSalesReturn,
+    GetAllConfig,
+    getWarehouseInfoList,
+    getSalesReturnList,
+    getWarehouseList
+  } from '@/api/stock'
+
+  export default {
+    name: 'otherSalesReturnOrder',
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetSalesReturn()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        saleReturnDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: [],
+
+      }
+    },
+    methods: {
+      AddNewOrder:function(){
+        this.$router.push({ name: 'salesReturnOrderAdd'})
+      },
+      GetSalesReturn: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time
+        }
+        this.saleReturnDate = []
+        getSalesReturnList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.saleReturnDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetWarehouse()
+      }, endTimeChange(val) {
+        this.GetWarehouse()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'salesReturnDetail', query: { id: row.id }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteSalesReturn(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.saleReturnDate.length; y++) {
+                  if (ids[i] == this.saleReturnDate[y].id) {
+                    this.saleReturnDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteSalesReturn(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.saleReturnDate.length; y++) {
+                  if (ids[i] == this.saleReturnDate[y].id) {
+                    this.saleReturnDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/otherSalesReturnOrderAdd.vue

@@ -0,0 +1,413 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                         :visibility="isVisibility"
+                         v-on:dialog-comfirm="comfirm"
+                         v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8"><div>
+          <span>退货时间:</span>
+          <el-date-picker v-model="return_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"></el-date-picker>
+        </div></el-col>
+
+
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
+              <el-form-item label="厂商：" prop="manufacturer">
+                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
+                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" label-width="80px">
+              <el-form-item label="经销商：">
+                <el-select v-model="form.dealer" placeholder="请选择经销商">
+                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+      </el-row>
+
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope" >
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>退货数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--{{scope.row.warehousing_count}}-->
+                <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.return_count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import {
+    getSalesReturnConfig,
+    postSalesReturn,
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog},
+    name: 'otherSalesReturnOrderAdd',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        return_time: '',
+        currentIndex: 0,
+        recordInfo: {
+          recordData: [],
+        },
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+          return_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+        },
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getSalesReturnConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseList =  response.data.data.warehouseList
+            var warehouseInfoList =  response.data.data.warehouseInfoList
+            for (let i = 0; i <warehouseList.length; i++ ){
+              if(warehouseList[i].Manufacturer.id > 0){
+                this.manufacturer.push(warehouseList[i].Manufacturer)
+              }
+              if(warehouseList[i].Dealer.id > 0){
+                this.dealer.push(warehouseList[i].Dealer)
+              }
+            }
+
+            for (let i = 0; i < warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
+
+            }
+
+
+            const obj = {}
+            const obj2 = {}
+            const obj4 = {}
+            //去重复
+            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            //去重复
+            this.dealer =  this.dealer.reduce((cur, next) => {
+              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+
+
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = ''
+        tempObj['price'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        this.recordInfo.recordData.splice(index, 1)
+      }, calculate: function(val) {
+
+        if (val == 0) {
+          return ''
+        }
+
+        return Math.round(parseFloat(val) * 100) / 100
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+          this.$message.error('请先选择厂商')
+          return
+        } else {
+          this.isVisibility = true
+          console.log(this.form.manufacturer)
+          for (let i = 0; i < this.propForm.goodInfo.length; i++){
+            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
+              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+            }
+
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+
+
+
+        }
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            if (this.form.manufacturer == 0) {
+              this.$message.error('厂商不能为空')
+              return
+            }
+            const array = this.recordInfo.recordData
+            let total = 0
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+              total = total + array[i].price * array[i].return_count
+            }
+            const params = {
+              'salesReturn': this.recordInfo.recordData
+            }
+            postSalesReturn(params,this.return_time,total,this.form.dealer,this.form.manufacturer).then(response=>{
+              if (response.data.state==0) {
+                this.$message.error(response.data.msg);
+                return false;
+              }else {
+                this.$notify({
+                  title: "成功",
+                  message: "退货成功",
+                  type: "success",
+                  duration: 2000
+                });
+                this.recordInfo.recordData = []
+                this.$router.back(-1)
+              }
+            });
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.return_time = endTime
+      const tempObj = {}
+      tempObj['good_type_id'] = 0
+      tempObj['good_id'] = 0
+      tempObj['return_count'] = ''
+      tempObj['price'] = ''
+      this.recordInfo.recordData.push(tempObj)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/otherSalesReturnOrderDetail.vue

@@ -0,0 +1,232 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <div class="filter-container">
+      <span style="font-size: 20px">退货单详情</span>
+      <el-row style="float:right;">
+        <span>{{ReturnInfo.salesReturn.order_number}}</span>
+      </el-row>
+    </div>
+
+
+
+    <div class="filter-container">
+      <span>单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span>厂商 {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
+      <span>经销商 {{getDealerName(ReturnInfo.salesReturn.dealer)}}</span>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
+      <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="ReturnInfo.returnInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+      >
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>物品类型</span>
+          </template>
+
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>规格名称</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>退货数量</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.count}}</span>
+
+          </template>
+        </el-table-column>
+
+
+      </el-table>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { GetAllConfig,getReturnList,deleteSalesReturn } from '@/api/stock'
+
+  export default {
+    name: 'otherSalesReturnOrderDetail',
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        ReturnInfo: {
+          loading: false,
+          returnInfoData: [],
+          salesReturn: {}
+        }
+      }
+    },
+    methods: {
+      getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getReturnList(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.ReturnInfo.returnInfoData.push(response.data.data.list[i])
+            }
+            this.ReturnInfo.salesReturn = response.data.data.salesReturn
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.ReturnInfo.salesReturn.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteSalesReturn(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/otherSalesReturnOrderEdit.vue

@@ -0,0 +1,391 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                         :visibility="isVisibility"
+                         v-on:dialog-comfirm="comfirm"
+                         v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8">
+          <div>
+            <span>入库时间:</span>
+            <el-date-picker v-model="return_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"></el-date-picker>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                            :value="typeName(scope.row.good_type_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                            :value="specificationName(scope.row.good_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>退货数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                              style="padding-top: 17px">
+                  <el-input type="number" v-model="scope.row.count"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  import {
+    deleteSalesReturnInfo,
+    getReturnList,
+    getSalesReturnConfig,
+    editSalesReturnInfo
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog },
+    name: 'otherSalesReutrnOrderEdit',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+        return_time: '',
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库'
+        },
+
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        salesReturn: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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['id'] = 0
+              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_id'] = val.selectedGoodInfo[i].id
+              tempForm['count'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getSalesReturnConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseInfoList = response.data.data.warehouseInfoList
+            for (let i = 0; i < warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
+              this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
+
+            }
+            const obj3 = {}
+            const obj4 = {}
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['count'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该退货物品信息记录?', '删除退货物品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteSalesReturnInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '删除成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+
+        this.isVisibility = true
+        console.log(this.form.manufacturer)
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
+            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+          }
+        }
+        const obj3 = {}
+        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'salesReturn': this.recordInfo.recordData
+            }
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '退货成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getReturnList(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.recordInfo.list[i].count =  this.recordInfo.list[i].count.toString();
+              this.recordInfo.recordData.push(response.data.data.list[i])
+            }
+            this.salesReturn = response.data.data.salesReturn
+            this.return_time = this.getTime(this.salesReturn.return_time, '{y}-{m}-{d}')
+            this.form.manufacturer = this.salesReturn.manufacturer
+            this.form.dealer = this.salesReturn.dealer
+          }
+        })
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/otherStockInDetail.vue

@@ -0,0 +1,24 @@
+<template>
+  <other-stock-in-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></other-stock-in-order-detail>
+  <other-stock-in-order-edit v-else></other-stock-in-order-edit>
+</template>
+
+<script>
+  import OtherStockInOrderEdit from './otherStockInOrderEdit'
+  import OtherStockInOrderDetail from './otherStockInOrderDetail'
+  export default {
+    name: 'otherStockInDetail',
+    components: { OtherStockInOrderDetail, OtherStockInOrderEdit },
+    data() {
+      return {
+        isEdit: 0
+      }
+    }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/otherStockInOrder.vue

@@ -0,0 +1,506 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+
+    <div class="filter-container">
+
+
+      <el-row style="float:right;">
+        <el-button @click="handleWarehouse" type="primary">新增</el-button>
+      </el-row>
+    </div>
+
+    <div class="filter-container" style="margin-top:20px">
+      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <div class="filter-container">
+      <span>入库时间:</span>
+      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+      <span class="">-</span>
+      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+      <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="Warehouse.warehouseDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%" border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @selection-change="select"
+
+      >
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.warehousing_time | parseTime('{y}-{m}-{d}')}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.warehousing_order}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{getXuserName(scope.row.creater)}}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="厂家" align="center">
+          <template slot-scope="scope">
+            {{getManufactuerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="经销商" align="center">
+          <template slot-scope="scope">
+            {{getDealerName(scope.row.dealer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+
+          </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 {
+    deleteWarehouseInfo,
+    GetAllConfig,
+    GetAllGoodInfo,
+    GetAllGoodType,
+    getWarehouseInfoList,
+    getWarehouseList
+  } from '@/api/stock'
+
+  export default {
+    name: 'otherStockInOrder',
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetWarehouse()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: [],
+        Warehouse: {
+          loading: false,
+          warehouseDate: [],
+          tableCurrentIndex: ''
+        },
+
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        }
+      }
+    },
+    methods: {
+      GetWarehouse: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time
+        }
+        this.Warehouse.warehouseDate = []
+        getWarehouseList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.Warehouse.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Warehouse.loading = false
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.Warehouse.warehouseDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, tableRowClassName({ row, rowIndex }) {
+        // 把每一行的索引放进row
+        row.index = rowIndex
+      },
+      onRowClick(row, event, column) {
+        this.WarehouseInfo.warehouseInfoDate = []
+        this.Warehouse.tableCurrentIndex = row.index
+        const params = {
+          'id': row.id
+        }
+        this.WarehouseInfo.loading = true
+        getWarehouseInfoList(params).then(response => {
+          if (response.data.state == 0) {
+            this.WarehouseInfo.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.WarehouseInfo.loading = false
+            for (let i = 0; i < response.data.data.info.length; i++) {
+              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllDoctorAndNurse() {
+        fetchAllDoctorAndNurse().then(response => {
+          if (response.data.state == 1) {
+            this.doctorOptions = response.data.data.doctors
+          }
+        })
+      },
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetAllGoodType: function() {
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            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().then(response => {
+          if (response.data.state == 0) {
+            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])
+            }
+          }
+        })
+      }, clicks: function() {
+        console.log(this.WarehouseInfo.warehouseInfoDate)
+      }, handleWarehouse: function() {
+        this.$router.push({ path: '/stock/in/add' })
+      }, handleReturnSales: function() {
+        // this.$router.push({path:'/patients/create'}
+        if (this.multipleSelection.length <= 0) {
+          this.$message.error('请选择退货物品')
+          return
+        }
+
+        const ids = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          ids.push(this.multipleSelection[i].id)
+        }
+        this.$router.push({ name: 'salesReturn', query: { id: ids.join('&') }})
+      }, handleReturnSalesRecord: function() {
+        this.$router.push({ name: 'salesReutrnRecord' })
+      }, handleWarehouseRecord: function() {
+        this.$router.push({ name: 'warehouseRecord' })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetWarehouse()
+      }, endTimeChange(val) {
+        this.GetWarehouse()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'stockInDetail', query: { id: row.id }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除入库单记录?', '删除入库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.Warehouse.warehouseDate.length; y++) {
+                  if (ids[i] == this.Warehouse.warehouseDate[y].id) {
+                    this.Warehouse.warehouseDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除入库单记录?', '删除入库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.Warehouse.warehouseDate.length; y++) {
+                  if (ids[i] == this.Warehouse.warehouseDate[y].id) {
+                    this.Warehouse.warehouseDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/otherStockInOrderAdd.vue

@@ -0,0 +1,611 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <stock-in-dialog :propForm="propForm"
+                     :visibility="isVisibility"
+                     v-on:dialog-comfirm="comfirm"
+                     v-on:dialog-cancle="cancle"></stock-in-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8"><div>
+          <span>入库时间:</span>
+          <el-date-picker v-model="warehousing_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"></el-date-picker>
+        </div></el-col>
+
+
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
+              <el-form-item label="厂商：" prop="manufacturer">
+                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
+                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" label-width="80px">
+              <el-form-item label="经销商：">
+                <el-select v-model="form.dealer" placeholder="请选择经销商">
+                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+      </el-row>
+
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope" >
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>单价<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.price" ></el-input>
+                </el-form-item>
+
+
+              </template>
+            </el-table-column>
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>入库数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--{{scope.row.warehousing_count}}-->
+                <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'" :rules='tableRules.warehousing_count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.warehousing_count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="总价" min-width="20" align="center">
+              <template slot-scope="scope">
+                {{calculate(scope.row.price*scope.row.warehousing_count)}}
+              </template>
+            </el-table-column>
+
+            <el-table-column  align="center" min-width="25">
+              <template slot="header" slot-scope="scope">
+                <span>批号<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input  v-model="scope.row.numbers"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number' style="padding-top: 17px">
+                  <el-input  v-model="scope.row.number" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="生产日期" min-width="40" align="center">
+              <template slot-scope="scope" >
+                <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
+                <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"></el-date-picker>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="有效日期" min-width="40" align="center">
+              <template slot-scope="scope">
+                <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
+                <el-date-picker  prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
+                                 type="date" placeholder="选择日期时间"  format="yyyy-MM-dd"
+                                 value-format="yyyy-MM-dd"></el-date-picker>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="20" align="center">
+              <template slot-scope="scope">
+                <el-input  v-model="scope.row.remark"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import stockInDialog from './Dialog/stockInDialog'
+  import { uParseTime } from '@/utils/tools'
+
+  import {
+    GetAllGoodInfo,
+    GetAllGoodType,
+    postWarehouse,
+    GetAllConfig,
+    GetAllGoodInfoByID,
+    getWarehouseInfoByOrdeNumber,
+    modifyWarehouseInfo,
+    deleteWarehouseInfo
+  } from '@/api/stock'
+
+  export default {
+    components: { stockInDialog },
+    name: 'stockIn',
+
+    data() {
+      var checkGoodId = (rule, value, callback) => {
+        setTimeout(() => {
+          if (value == '' || value == 0) {
+            return callback(new Error('规格名称不能为空'))
+          }
+        }, 2000)
+      }
+
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+          warehousing_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+          number: [
+            { required: true, message: '批号不能为空', trigge: 'blur' }
+          ],
+          good_id: [
+            { validator: checkGoodId, trigger: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+
+        total: '',
+        product_date: '',
+        expiry_date: '',
+        numbers: '',
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库',
+          formValue: {
+            good_type_id: '',
+            good_id: '',
+            number: '',
+            product_date: '',
+            expiry_date: '',
+            warehousing_count: '',
+            price: '',
+            remark: '',
+            dealer: '',
+            manufacturer: ''
+
+          },
+          isCreated: 1
+
+        },
+
+        goodInfo: {
+          loading: false,
+          goodTypeData: [],
+          type_code: ''
+        },
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        formValue: {
+          good_type_id: '',
+          good_id: '',
+          number: '',
+          product_date: '',
+          expiry_date: '',
+          warehousing_count: '',
+          price: '',
+          remark: '',
+          dealer: '',
+          manufacturer: ''
+
+        },
+
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      handleSave: function() {
+        if (this.recordInfo.recordData.length <= 0) {
+          this.$message.error('请添加入库信息')
+          return
+        }
+        sessionStorage.removeItem('warehousing_orders')
+        this.$router.back(-1)
+      }, handleCancle: function() {
+        this.$confirm('是否放弃编辑返回上一页?', '放弃编辑', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          sessionStorage.removeItem('warehousing_orders')
+          this.$router.back(-1)
+        }).catch(() => {
+
+        })
+      }, handleCreate: function() {
+        this.propForm.formValue = {}
+        this.propForm.isCreated = 1
+        this.isVisibility = true
+      }, comfirm: function(val) {
+        this.isVisibility = false
+        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['number'] = ''
+              tempForm['product_date'] = 0
+              tempForm['expiry_date'] = 0
+              tempForm['warehousing_count'] = ''
+              tempForm['price'] = ''
+              tempForm['remark'] = ''
+              tempForm['dealer'] = ''
+              tempForm['manufacturer'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetAllGoodType: function() {
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              this.propForm.goodType.push(response.data.data.goodType[i])
+            }
+          }
+        })
+      }, GetAllGoodInfo: function() {
+        GetAllGoodInfo().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+              this.propForm.goodInfo.push(response.data.data.goodInfo[i])
+            }
+          }
+        })
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodType = response.data.data.goodType
+            this.goodInfo = response.data.data.goodInfo
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = '请输入物品类型'
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['number'] = ''
+        tempObj['product_date'] = ''
+        tempObj['expiry_date'] = ''
+        tempObj['warehousing_count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        tempObj['dealer'] = ''
+        tempObj['manufacturer'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        this.recordInfo.recordData.splice(index, 1)
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetWarehouseInfoByOrdeNumber: function() {
+        const params = {
+          'warehousing_order': sessionStorage.getItem('warehousing_orders')
+        }
+        this.recordInfo.recordData = []
+        getWarehouseInfoByOrdeNumber(params).then(response => {
+          if (response.data.state != 0) {
+            for (let i = 0; i < response.data.data.info.length; i++) {
+              this.recordInfo.recordData.push(response.data.data.info[i])
+            }
+          }
+        })
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+          this.$message.error('请先选择厂商')
+          return
+        } else {
+          this.isVisibility = true
+          const params = {
+            id: this.form.manufacturer
+          }
+          GetAllGoodInfoByID(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.goodInfo.length == 0) {
+                this.$message.error('该厂商没商品，请添加商品')
+              } else {
+                for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+                  this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                }
+
+                const obj = {}
+                this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+                  obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                  return cur
+                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+              }
+            }
+          })
+        }
+      }, getSummaries(param) {
+        const { columns, data } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '总价'
+            return
+          }
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        })
+
+        return sums
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            if (this.form.manufacturer == 0) {
+              this.$message.error('厂商不能为空')
+              return
+            }
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'stockIn': this.recordInfo.recordData
+            }
+            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '入库成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.warehousing_time = endTime
+
+      const tempObj = {}
+      tempObj['good_type_id'] = 0
+      tempObj['good_id'] = 0
+      tempObj['number'] = ''
+      tempObj['product_date'] = ''
+      tempObj['expiry_date'] = ''
+      tempObj['warehousing_count'] = ''
+      tempObj['price'] = ''
+      tempObj['remark'] = ''
+      tempObj['dealer'] = ''
+      tempObj['manufacturer'] = ''
+
+      this.recordInfo.recordData.push(tempObj)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/otherStockInOrderDetail.vue

@@ -0,0 +1,281 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <div class="filter-container">
+      <span style="font-size: 20px">耗材入库单详情</span>
+      <el-row style="float:right;">
+        <span>{{WarehouseInfo.warehouse.warehousing_order}}</span>
+      </el-row>
+    </div>
+
+
+
+    <div class="filter-container">
+      <span>单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span>厂商 {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
+      <span>经销商 {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
+      <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="WarehouseInfo.warehouseInfoDate" :class="signAndWeighBoxPatients" style="width: 100%" border
+      >
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>物品类型</span>
+          </template>
+
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>规格名称</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>单价</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.price}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>入库数量</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.warehousing_count}}</span>
+
+          </template>
+        </el-table-column>
+
+        <el-table-column label="总价" min-width="20" align="center">
+          <template slot-scope="scope">
+            {{calculate(scope.row.price*scope.row.warehousing_count)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" min-width="25">
+          <template slot="header" slot-scope="scope">
+            <span>批号</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.number}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="生产日期" min-width="40" align="center">
+          <template slot-scope="scope">
+            {{scope.row.product_date | parseTime('{y}-{m}-{d}')}}
+
+          </template>
+        </el-table-column>
+        <el-table-column label="有效日期" min-width="40" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.expiry_date | parseTime('{y}-{m}-{d}')}}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="20"  align="center">
+          <template slot-scope="scope">
+            <el-popover placement="top-start"  width="250" trigger="hover" >
+              <div>{{scope.row.remark}}</div>
+              <span slot="reference" v-if="scope.row.remark.length > 20">{{ scope.row.remark.substr(0,20)+'...' }}</span>
+              <span slot="reference" v-else>{{ scope.row.remark}}</span>
+            </el-popover>
+
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { GetAllConfig, getWarehouseInfoList, deleteWarehouseInfo } from '@/api/stock'
+
+  export default {
+    name: 'otherStockInOrderDetail',
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+        Warehouse: {
+          loading: false,
+          warehouseDate: [],
+          tableCurrentIndex: ''
+        },
+
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: [],
+          warehouse: {}
+        }
+      }
+    },
+    methods: {
+      getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getWarehouseInfoList(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.info.length; i++) {
+              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i])
+            }
+            this.WarehouseInfo.warehouse = response.data.data.warehousing
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.WarehouseInfo.warehouse.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除入库单记录?', '删除入库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/otherStockInOrderEdit.vue

@@ -0,0 +1,502 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                         :visibility="isVisibility"
+                         v-on:dialog-comfirm="comfirm"
+                         v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8"><div>
+          <span>入库时间:</span>
+          <el-date-picker v-model="warehousing_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"></el-date-picker>
+        </div></el-col>
+      </el-row>
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope" >
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>单价<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.price" ></el-input>
+                </el-form-item>
+
+
+
+
+              </template>
+            </el-table-column>
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>入库数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--{{scope.row.warehousing_count}}-->
+                <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'" :rules='tableRules.warehousing_count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.warehousing_count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="总价" min-width="20" align="center">
+              <template slot-scope="scope">
+                {{calculate(scope.row.price*scope.row.warehousing_count)}}
+              </template>
+            </el-table-column>
+
+            <el-table-column  align="center" min-width="25">
+              <template slot="header" slot-scope="scope">
+                <span>批号<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input  v-model="scope.row.numbers"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number' style="padding-top: 17px">
+                  <el-input  v-model="scope.row.number" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="生产日期" min-width="40" align="center">
+              <template slot-scope="scope" >
+                <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
+                <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"></el-date-picker>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="有效日期" min-width="40" align="center">
+              <template slot-scope="scope">
+                <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
+                <el-date-picker  prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
+                                 type="date" placeholder="选择日期时间"  format="yyyy-MM-dd"
+                                 value-format="yyyy-MM-dd"></el-date-picker>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="20" align="center">
+              <template slot-scope="scope">
+                <el-input  v-model="scope.row.remark"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import stockInDialog from './Dialog/stockInDialog'
+  import { uParseTime } from '@/utils/tools'
+
+  import {
+    GetAllConfig,
+    getWarehouseInfoList,
+    GetAllGoodInfoByID,
+    getWarehouseInfoByOrdeNumber,
+    modifyWarehouseInfo,
+    deleteWarehouseInfo,
+    DeleteWarehouseInfoItem,
+    EditWarehouse
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog, stockInDialog },
+    name: 'stockInOrderEdit',
+
+    data() {
+      var checkGoodId = (rule, value, callback) => {
+        setTimeout(() => {
+          if (value == '' || value == 0) {
+            return callback(new Error('规格名称不能为空'))
+          }
+        }, 2000)
+      }
+
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+          warehousing_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+          number: [
+            { required: true, message: '批号不能为空', trigge: 'blur' }
+          ],
+          good_id: [
+            { validator: checkGoodId, trigger: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+
+        total: '',
+        product_date: '',
+        expiry_date: '',
+        numbers: '',
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库',
+          isCreated: 1
+
+        },
+
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+        warehouse: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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['id'] = 0
+              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_id'] = val.selectedGoodInfo[i].id
+              tempForm['number'] = ''
+              tempForm['product_date'] = ''
+              tempForm['expiry_date'] = ''
+              tempForm['warehousing_count'] = ''
+              tempForm['price'] = ''
+              tempForm['remark'] = ''
+              tempForm['dealer'] = ''
+              tempForm['manufacturer'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      },  GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodType = response.data.data.goodType
+            this.goodInfo = response.data.data.goodInfo
+          }
+        })
+
+      }, typeName: function(good_type_id) {
+        let name = '请输入物品类型'
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['number'] = ''
+        tempObj['product_date'] = ''
+        tempObj['expiry_date'] = ''
+        tempObj['warehousing_count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        tempObj['dealer'] = ''
+        tempObj['manufacturer'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该入库物品信息记录?', '删除入库物品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            DeleteWarehouseInfoItem(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '删除成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      },  getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+          this.$message.error('请先选择厂商')
+          return
+        } else {
+          this.isVisibility = true
+          const params = {
+            id: this.form.manufacturer
+          }
+          GetAllGoodInfoByID(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.goodInfo.length == 0) {
+                this.$message.error('该厂商没商品，请添加商品')
+              } else {
+                for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+                  this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                }
+
+                const obj = {}
+                this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+                  obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                  return cur
+                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+              }
+            }
+          })
+        }
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'stockIn': this.recordInfo.recordData
+            }
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '入库成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getWarehouseInfoList(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.info.length; i++) {
+              response.data.data.info[i].product_date = this.getTime(response.data.data.info[i].product_date, '{y}-{m}-{d}')
+              response.data.data.info[i].expiry_date = this.getTime(response.data.data.info[i].expiry_date, '{y}-{m}-{d}')
+              response.data.data.info[i].price = response.data.data.info[i].price.toString()
+              response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString()
+
+              this.recordInfo.recordData.push(response.data.data.info[i])
+            }
+
+            this.warehouse = response.data.data.warehousing
+            this.form.manufacturer = this.warehouse.manufacturer
+            this.form.dealer = this.warehouse.dealer
+            this.warehousing_time = this.getTime(this.warehouse.warehousing_time, '{y}-{m}-{d}')
+          }
+        })
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/otherStockOutDetail.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'otherStockOutDetail'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/otherStockOutOrder.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'otherStockOutOrder'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/otherStockOutOrderAdd.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'otherStockOutOrderAdd'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/otherStockOutOrderDetail.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'otherStockOutOrderDetail'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/otherStockOutOrderEdit.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'otherStockOutOrderEdit'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/salesReturnDetail.vue

@@ -0,0 +1,24 @@
+<template>
+  <sales-return-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></sales-return-order-detail>
+  <sales-return-edit v-else></sales-return-edit>
+</template>
+
+<script>
+  import SalesReturnEdit from './salesReturnEdit'
+  import SalesReturnOrderDetail from './salesReturnOrderDetail'
+  export default {
+    name: 'stockInDeatail',
+    components: { SalesReturnOrderDetail, SalesReturnEdit },
+    data() {
+      return {
+        isEdit: 0
+      }
+    }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/salesReturnEdit.vue

@@ -0,0 +1,391 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                     :visibility="isVisibility"
+                     v-on:dialog-comfirm="comfirm"
+                     v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8">
+          <div>
+            <span>入库时间:</span>
+            <el-date-picker v-model="return_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"></el-date-picker>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                            :value="typeName(scope.row.good_type_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                            :value="specificationName(scope.row.good_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>退货数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                              style="padding-top: 17px">
+                  <el-input type="number" v-model="scope.row.count"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  import {
+    deleteSalesReturnInfo,
+    getReturnList,
+    getSalesReturnConfig,
+    editSalesReturnInfo
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog },
+    name: 'salesReturnEdit',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+        return_time: '',
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库'
+        },
+
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        salesReturn: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+       comfirm: function(val) {
+        this.isVisibility = false
+        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['id'] = 0
+              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_id'] = val.selectedGoodInfo[i].id
+              tempForm['count'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getSalesReturnConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseInfoList = response.data.data.warehouseInfoList
+            for (let i = 0; i < warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
+              this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
+
+            }
+            const obj3 = {}
+            const obj4 = {}
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['count'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该退货物品信息记录?', '删除退货物品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteSalesReturnInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '删除成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+
+        this.isVisibility = true
+        console.log(this.form.manufacturer)
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
+            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+          }
+        }
+        const obj3 = {}
+        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'salesReturn': this.recordInfo.recordData
+            }
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '退货成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getReturnList(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.recordInfo.list[i].count =  this.recordInfo.list[i].count.toString();
+              this.recordInfo.recordData.push(response.data.data.list[i])
+            }
+            this.salesReturn = response.data.data.salesReturn
+            this.return_time = this.getTime(this.salesReturn.return_time, '{y}-{m}-{d}')
+            this.form.manufacturer = this.salesReturn.manufacturer
+            this.form.dealer = this.salesReturn.dealer
+          }
+        })
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/salesReturnOrder.vue

@@ -0,0 +1,408 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+
+    <div class="filter-container">
+
+
+      <el-row style="float:right;">
+        <el-button @click="AddNewOrder" type="primary">新增</el-button>
+      </el-row>
+    </div>
+
+    <div class="filter-container" style="margin-top:20px">
+      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <div class="filter-container">
+      <span>入库时间:</span>
+      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+      <span class="">-</span>
+      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+      <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="saleReturnDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%" border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+
+      >
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.opera_time | parseTime('{y}-{m}-{d}')}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.order_number}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{getXuserName(scope.row.creater)}}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="厂家" align="center">
+          <template slot-scope="scope">
+            {{getManufactuerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="经销商" align="center">
+          <template slot-scope="scope">
+            {{getDealerName(scope.row.dealer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+
+          </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 {
+    deleteSalesReturn,
+    GetAllConfig,
+    getWarehouseInfoList,
+    getSalesReturnList,
+    getWarehouseList
+  } from '@/api/stock'
+
+  export default {
+    name: 'salesReturnOrder',
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetSalesReturn()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        saleReturnDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: [],
+
+      }
+    },
+    methods: {
+      AddNewOrder:function(){
+        this.$router.push({ name: 'salesReturnOrderAdd'})
+      },
+      GetSalesReturn: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time
+        }
+        this.saleReturnDate = []
+        getSalesReturnList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.saleReturnDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetWarehouse()
+      }, endTimeChange(val) {
+        this.GetWarehouse()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'salesReturnDetail', query: { id: row.id }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteSalesReturn(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.saleReturnDate.length; y++) {
+                  if (ids[i] == this.saleReturnDate[y].id) {
+                    this.saleReturnDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteSalesReturn(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.saleReturnDate.length; y++) {
+                  if (ids[i] == this.saleReturnDate[y].id) {
+                    this.saleReturnDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -0,0 +1,413 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                     :visibility="isVisibility"
+                     v-on:dialog-comfirm="comfirm"
+                     v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8"><div>
+          <span>退货时间:</span>
+          <el-date-picker v-model="return_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"></el-date-picker>
+        </div></el-col>
+
+
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
+              <el-form-item label="厂商：" prop="manufacturer">
+                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
+                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" label-width="80px">
+              <el-form-item label="经销商：">
+                <el-select v-model="form.dealer" placeholder="请选择经销商">
+                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+      </el-row>
+
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope" >
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>退货数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--{{scope.row.warehousing_count}}-->
+                <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.return_count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import {
+    getSalesReturnConfig,
+    postSalesReturn,
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog},
+    name: 'salesReturnOrderAdd',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        return_time: '',
+        currentIndex: 0,
+        recordInfo: {
+          recordData: [],
+        },
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+          return_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+        },
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getSalesReturnConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseList =  response.data.data.warehouseList
+            var warehouseInfoList =  response.data.data.warehouseInfoList
+            for (let i = 0; i <warehouseList.length; i++ ){
+              if(warehouseList[i].Manufacturer.id > 0){
+                this.manufacturer.push(warehouseList[i].Manufacturer)
+              }
+              if(warehouseList[i].Dealer.id > 0){
+                this.dealer.push(warehouseList[i].Dealer)
+              }
+            }
+
+            for (let i = 0; i < warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
+
+            }
+
+
+            const obj = {}
+            const obj2 = {}
+            const obj4 = {}
+            //去重复
+            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            //去重复
+            this.dealer =  this.dealer.reduce((cur, next) => {
+              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+
+
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['return_count'] = ''
+        tempObj['price'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        this.recordInfo.recordData.splice(index, 1)
+      }, calculate: function(val) {
+
+        if (val == 0) {
+          return ''
+        }
+
+        return Math.round(parseFloat(val) * 100) / 100
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+          this.$message.error('请先选择厂商')
+          return
+        } else {
+          this.isVisibility = true
+          console.log(this.form.manufacturer)
+          for (let i = 0; i < this.propForm.goodInfo.length; i++){
+            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
+              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+            }
+
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+
+
+
+        }
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            if (this.form.manufacturer == 0) {
+              this.$message.error('厂商不能为空')
+              return
+            }
+            const array = this.recordInfo.recordData
+            let total = 0
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+              total = total + array[i].price * array[i].return_count
+            }
+            const params = {
+              'salesReturn': this.recordInfo.recordData
+            }
+            postSalesReturn(params,this.return_time,total,this.form.dealer,this.form.manufacturer).then(response=>{
+              if (response.data.state==0) {
+                this.$message.error(response.data.msg);
+                return false;
+              }else {
+                this.$notify({
+                  title: "成功",
+                  message: "退货成功",
+                  type: "success",
+                  duration: 2000
+                });
+                this.recordInfo.recordData = []
+                this.$router.back(-1)
+              }
+            });
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.return_time = endTime
+      const tempObj = {}
+      tempObj['good_type_id'] = 0
+      tempObj['good_id'] = 0
+      tempObj['return_count'] = ''
+      tempObj['price'] = ''
+      this.recordInfo.recordData.push(tempObj)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/salesReturnOrderDetail.vue

@@ -0,0 +1,232 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <div class="filter-container">
+      <span style="font-size: 20px">退货单详情</span>
+      <el-row style="float:right;">
+        <span>{{ReturnInfo.salesReturn.order_number}}</span>
+      </el-row>
+    </div>
+
+
+
+    <div class="filter-container">
+      <span>单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span>厂商 {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
+      <span>经销商 {{getDealerName(ReturnInfo.salesReturn.dealer)}}</span>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
+      <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="ReturnInfo.returnInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+      >
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>物品类型</span>
+          </template>
+
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>规格名称</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>退货数量</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.count}}</span>
+
+          </template>
+        </el-table-column>
+
+
+      </el-table>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { GetAllConfig,getReturnList,deleteSalesReturn } from '@/api/stock'
+
+  export default {
+    name: 'stockInOrderDetail',
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        ReturnInfo: {
+          loading: false,
+          returnInfoData: [],
+          salesReturn: {}
+        }
+      }
+    },
+    methods: {
+      getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getReturnList(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.ReturnInfo.returnInfoData.push(response.data.data.list[i])
+            }
+            this.ReturnInfo.salesReturn = response.data.data.salesReturn
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.ReturnInfo.salesReturn.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteSalesReturn(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/stockInDetail.vue

@@ -0,0 +1,24 @@
+<template>
+  <stock-in-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></stock-in-order-detail>
+  <stock-in-order-edit v-else></stock-in-order-edit>
+</template>
+
+<script>
+  import StockInOrderDetail from './stockInOrderDetail'
+  import StockInOrderEdit from './stockInOrderEdit'
+  export default {
+    name: 'stockInDeatail',
+    components: { StockInOrderEdit, StockInOrderDetail },
+    data() {
+      return {
+        isEdit: 0
+      }
+  }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/stockInOrder.vue

@@ -0,0 +1,506 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+
+    <div class="filter-container">
+
+
+      <el-row style="float:right;">
+        <el-button @click="handleWarehouse" type="primary">新增</el-button>
+      </el-row>
+    </div>
+
+    <div class="filter-container" style="margin-top:20px">
+      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <div class="filter-container">
+      <span>入库时间:</span>
+      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+      <span class="">-</span>
+      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+      <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="Warehouse.warehouseDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%" border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @selection-change="select"
+
+      >
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.warehousing_time | parseTime('{y}-{m}-{d}')}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.warehousing_order}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{getXuserName(scope.row.creater)}}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="厂家" align="center">
+          <template slot-scope="scope">
+            {{getManufactuerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="经销商" align="center">
+          <template slot-scope="scope">
+            {{getDealerName(scope.row.dealer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+
+          </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 {
+    deleteWarehouseInfo,
+    GetAllConfig,
+    GetAllGoodInfo,
+    GetAllGoodType,
+    getWarehouseInfoList,
+    getWarehouseList
+  } from '@/api/stock'
+
+  export default {
+    name: 'stockIn',
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetWarehouse()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: [],
+        Warehouse: {
+          loading: false,
+          warehouseDate: [],
+          tableCurrentIndex: ''
+        },
+
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        }
+      }
+    },
+    methods: {
+      GetWarehouse: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time
+        }
+        this.Warehouse.warehouseDate = []
+        getWarehouseList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.Warehouse.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Warehouse.loading = false
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.Warehouse.warehouseDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, tableRowClassName({ row, rowIndex }) {
+        // 把每一行的索引放进row
+        row.index = rowIndex
+      },
+      onRowClick(row, event, column) {
+        this.WarehouseInfo.warehouseInfoDate = []
+        this.Warehouse.tableCurrentIndex = row.index
+        const params = {
+          'id': row.id
+        }
+        this.WarehouseInfo.loading = true
+        getWarehouseInfoList(params).then(response => {
+          if (response.data.state == 0) {
+            this.WarehouseInfo.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.WarehouseInfo.loading = false
+            for (let i = 0; i < response.data.data.info.length; i++) {
+              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllDoctorAndNurse() {
+        fetchAllDoctorAndNurse().then(response => {
+          if (response.data.state == 1) {
+            this.doctorOptions = response.data.data.doctors
+          }
+        })
+      },
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetAllGoodType: function() {
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            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().then(response => {
+          if (response.data.state == 0) {
+            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])
+            }
+          }
+        })
+      }, clicks: function() {
+        console.log(this.WarehouseInfo.warehouseInfoDate)
+      }, handleWarehouse: function() {
+        this.$router.push({ path: '/stock/in/add' })
+      }, handleReturnSales: function() {
+        // this.$router.push({path:'/patients/create'}
+        if (this.multipleSelection.length <= 0) {
+          this.$message.error('请选择退货物品')
+          return
+        }
+
+        const ids = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          ids.push(this.multipleSelection[i].id)
+        }
+        this.$router.push({ name: 'salesReturn', query: { id: ids.join('&') }})
+      }, handleReturnSalesRecord: function() {
+        this.$router.push({ name: 'salesReutrnRecord' })
+      }, handleWarehouseRecord: function() {
+        this.$router.push({ name: 'warehouseRecord' })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetWarehouse()
+      }, endTimeChange(val) {
+        this.GetWarehouse()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'stockInDetail', query: { id: row.id }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除入库单记录?', '删除入库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.Warehouse.warehouseDate.length; y++) {
+                  if (ids[i] == this.Warehouse.warehouseDate[y].id) {
+                    this.Warehouse.warehouseDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除入库单记录?', '删除入库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.Warehouse.warehouseDate.length; y++) {
+                  if (ids[i] == this.Warehouse.warehouseDate[y].id) {
+                    this.Warehouse.warehouseDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -0,0 +1,611 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <stock-in-dialog :propForm="propForm"
+                     :visibility="isVisibility"
+                     v-on:dialog-comfirm="comfirm"
+                     v-on:dialog-cancle="cancle"></stock-in-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8"><div>
+          <span>入库时间:</span>
+          <el-date-picker v-model="warehousing_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"></el-date-picker>
+        </div></el-col>
+
+
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
+              <el-form-item label="厂商：" prop="manufacturer">
+                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
+                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" label-width="80px">
+              <el-form-item label="经销商：">
+                <el-select v-model="form.dealer" placeholder="请选择经销商">
+                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+      </el-row>
+
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope" >
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>单价<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.price" ></el-input>
+                </el-form-item>
+
+
+              </template>
+            </el-table-column>
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>入库数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--{{scope.row.warehousing_count}}-->
+                <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'" :rules='tableRules.warehousing_count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.warehousing_count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="总价" min-width="20" align="center">
+              <template slot-scope="scope">
+                {{calculate(scope.row.price*scope.row.warehousing_count)}}
+              </template>
+            </el-table-column>
+
+            <el-table-column  align="center" min-width="25">
+              <template slot="header" slot-scope="scope">
+                <span>批号<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input  v-model="scope.row.numbers"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number' style="padding-top: 17px">
+                  <el-input  v-model="scope.row.number" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="生产日期" min-width="40" align="center">
+              <template slot-scope="scope" >
+                <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
+                <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"></el-date-picker>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="有效日期" min-width="40" align="center">
+              <template slot-scope="scope">
+                <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
+                <el-date-picker  prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
+                                type="date" placeholder="选择日期时间"  format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"></el-date-picker>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="20" align="center">
+              <template slot-scope="scope">
+                  <el-input  v-model="scope.row.remark"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import stockInDialog from './Dialog/stockInDialog'
+  import { uParseTime } from '@/utils/tools'
+
+import {
+    GetAllGoodInfo,
+    GetAllGoodType,
+    postWarehouse,
+    GetAllConfig,
+    GetAllGoodInfoByID,
+    getWarehouseInfoByOrdeNumber,
+    modifyWarehouseInfo,
+    deleteWarehouseInfo
+  } from '@/api/stock'
+
+export default {
+    components: { stockInDialog },
+    name: 'stockIn',
+
+    data() {
+      var checkGoodId = (rule, value, callback) => {
+        setTimeout(() => {
+          if (value == '' || value == 0) {
+            return callback(new Error('规格名称不能为空'))
+          }
+        }, 2000)
+      }
+
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+          warehousing_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+          number: [
+            { required: true, message: '批号不能为空', trigge: 'blur' }
+          ],
+          good_id: [
+            { validator: checkGoodId, trigger: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+
+        total: '',
+        product_date: '',
+        expiry_date: '',
+        numbers: '',
+
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库',
+          formValue: {
+            good_type_id: '',
+            good_id: '',
+            number: '',
+            product_date: '',
+            expiry_date: '',
+            warehousing_count: '',
+            price: '',
+            remark: '',
+            dealer: '',
+            manufacturer: ''
+
+          },
+          isCreated: 1
+
+        },
+
+        goodInfo: {
+          loading: false,
+          goodTypeData: [],
+          type_code: ''
+        },
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        formValue: {
+          good_type_id: '',
+          good_id: '',
+          number: '',
+          product_date: '',
+          expiry_date: '',
+          warehousing_count: '',
+          price: '',
+          remark: '',
+          dealer: '',
+          manufacturer: ''
+
+        },
+
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+  },
+    methods: {
+      handleSave: function() {
+        if (this.recordInfo.recordData.length <= 0) {
+          this.$message.error('请添加入库信息')
+          return
+        }
+        sessionStorage.removeItem('warehousing_orders')
+        this.$router.back(-1)
+      }, handleCancle: function() {
+        this.$confirm('是否放弃编辑返回上一页?', '放弃编辑', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          sessionStorage.removeItem('warehousing_orders')
+          this.$router.back(-1)
+        }).catch(() => {
+
+        })
+      }, handleCreate: function() {
+        this.propForm.formValue = {}
+        this.propForm.isCreated = 1
+        this.isVisibility = true
+      }, comfirm: function(val) {
+        this.isVisibility = false
+        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['number'] = ''
+              tempForm['product_date'] = 0
+              tempForm['expiry_date'] = 0
+              tempForm['warehousing_count'] = ''
+              tempForm['price'] = ''
+              tempForm['remark'] = ''
+              tempForm['dealer'] = ''
+              tempForm['manufacturer'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetAllGoodType: function() {
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              this.propForm.goodType.push(response.data.data.goodType[i])
+            }
+          }
+        })
+      }, GetAllGoodInfo: function() {
+        GetAllGoodInfo().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+              this.propForm.goodInfo.push(response.data.data.goodInfo[i])
+            }
+          }
+        })
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodType = response.data.data.goodType
+            this.goodInfo = response.data.data.goodInfo
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = '请输入物品类型'
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['number'] = ''
+        tempObj['product_date'] = ''
+        tempObj['expiry_date'] = ''
+        tempObj['warehousing_count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        tempObj['dealer'] = ''
+        tempObj['manufacturer'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        this.recordInfo.recordData.splice(index, 1)
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetWarehouseInfoByOrdeNumber: function() {
+        const params = {
+          'warehousing_order': sessionStorage.getItem('warehousing_orders')
+        }
+        this.recordInfo.recordData = []
+        getWarehouseInfoByOrdeNumber(params).then(response => {
+          if (response.data.state != 0) {
+            for (let i = 0; i < response.data.data.info.length; i++) {
+              this.recordInfo.recordData.push(response.data.data.info[i])
+            }
+          }
+        })
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+          this.$message.error('请先选择厂商')
+          return
+        } else {
+          this.isVisibility = true
+          const params = {
+            id: this.form.manufacturer
+          }
+          GetAllGoodInfoByID(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.goodInfo.length == 0) {
+                this.$message.error('该厂商没商品，请添加商品')
+              } else {
+                for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+                  this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                }
+
+                const obj = {}
+                this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+                  obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                  return cur
+                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+              }
+            }
+          })
+        }
+      }, getSummaries(param) {
+        const { columns, data } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '总价'
+            return
+          }
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        })
+
+        return sums
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            if (this.form.manufacturer == 0) {
+              this.$message.error('厂商不能为空')
+              return
+            }
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'stockIn': this.recordInfo.recordData
+            }
+            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '入库成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.warehousing_time = endTime
+
+      const tempObj = {}
+      tempObj['good_type_id'] = 0
+      tempObj['good_id'] = 0
+      tempObj['number'] = ''
+      tempObj['product_date'] = ''
+      tempObj['expiry_date'] = ''
+      tempObj['warehousing_count'] = ''
+      tempObj['price'] = ''
+      tempObj['remark'] = ''
+      tempObj['dealer'] = ''
+      tempObj['manufacturer'] = ''
+
+      this.recordInfo.recordData.push(tempObj)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/stockInOrderDetail.vue

@@ -0,0 +1,281 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <div class="filter-container">
+      <span style="font-size: 20px">耗材入库单详情</span>
+      <el-row style="float:right;">
+        <span>{{WarehouseInfo.warehouse.warehousing_order}}</span>
+      </el-row>
+    </div>
+
+
+
+    <div class="filter-container">
+      <span>单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span>厂商 {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
+      <span>经销商 {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
+      <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="WarehouseInfo.warehouseInfoDate" :class="signAndWeighBoxPatients" style="width: 100%" border
+      >
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>物品类型</span>
+          </template>
+
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>规格名称</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>单价</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.price}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>入库数量</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.warehousing_count}}</span>
+
+          </template>
+        </el-table-column>
+
+        <el-table-column label="总价" min-width="20" align="center">
+          <template slot-scope="scope">
+            {{calculate(scope.row.price*scope.row.warehousing_count)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" min-width="25">
+          <template slot="header" slot-scope="scope">
+            <span>批号</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.number}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="生产日期" min-width="40" align="center">
+          <template slot-scope="scope">
+            {{scope.row.product_date | parseTime('{y}-{m}-{d}')}}
+
+          </template>
+        </el-table-column>
+        <el-table-column label="有效日期" min-width="40" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.expiry_date | parseTime('{y}-{m}-{d}')}}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="20"  align="center">
+          <template slot-scope="scope">
+            <el-popover placement="top-start"  width="250" trigger="hover" >
+              <div>{{scope.row.remark}}</div>
+              <span slot="reference" v-if="scope.row.remark.length > 20">{{ scope.row.remark.substr(0,20)+'...' }}</span>
+              <span slot="reference" v-else>{{ scope.row.remark}}</span>
+            </el-popover>
+
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { GetAllConfig, getWarehouseInfoList, deleteWarehouseInfo } from '@/api/stock'
+
+  export default {
+    name: 'stockInOrderDetail',
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+        Warehouse: {
+          loading: false,
+          warehouseDate: [],
+          tableCurrentIndex: ''
+        },
+
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: [],
+          warehouse: {}
+        }
+      }
+    },
+    methods: {
+      getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getWarehouseInfoList(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.info.length; i++) {
+              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i])
+            }
+            this.WarehouseInfo.warehouse = response.data.data.warehousing
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.WarehouseInfo.warehouse.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除入库单记录?', '删除入库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -0,0 +1,502 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                     :visibility="isVisibility"
+                     v-on:dialog-comfirm="comfirm"
+                     v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8"><div>
+          <span>入库时间:</span>
+          <el-date-picker v-model="warehousing_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"></el-date-picker>
+        </div></el-col>
+      </el-row>
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope" >
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>单价<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.price" ></el-input>
+                </el-form-item>
+
+
+
+
+              </template>
+            </el-table-column>
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>入库数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--{{scope.row.warehousing_count}}-->
+                <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'" :rules='tableRules.warehousing_count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.warehousing_count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="总价" min-width="20" align="center">
+              <template slot-scope="scope">
+                {{calculate(scope.row.price*scope.row.warehousing_count)}}
+              </template>
+            </el-table-column>
+
+            <el-table-column  align="center" min-width="25">
+              <template slot="header" slot-scope="scope">
+                <span>批号<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input  v-model="scope.row.numbers"></el-input>-->
+
+                <el-form-item :prop="'recordData.' + scope.$index + '.number'" :rules='tableRules.number' style="padding-top: 17px">
+                  <el-input  v-model="scope.row.number" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="生产日期" min-width="40" align="center">
+              <template slot-scope="scope" >
+                <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
+                <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"></el-date-picker>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="有效日期" min-width="40" align="center">
+              <template slot-scope="scope">
+                <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
+                <el-date-picker  prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
+                                 type="date" placeholder="选择日期时间"  format="yyyy-MM-dd"
+                                 value-format="yyyy-MM-dd"></el-date-picker>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="20" align="center">
+              <template slot-scope="scope">
+                <el-input  v-model="scope.row.remark"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import stockInDialog from './Dialog/stockInDialog'
+  import { uParseTime } from '@/utils/tools'
+
+import {
+  GetAllConfig,
+  getWarehouseInfoList,
+  GetAllGoodInfoByID,
+  getWarehouseInfoByOrdeNumber,
+  modifyWarehouseInfo,
+  deleteWarehouseInfo,
+  DeleteWarehouseInfoItem,
+  EditWarehouse
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+export default {
+    components: { SalesReturnDialog, stockInDialog },
+    name: 'stockIn',
+
+    data() {
+      var checkGoodId = (rule, value, callback) => {
+        setTimeout(() => {
+          if (value == '' || value == 0) {
+            return callback(new Error('规格名称不能为空'))
+          }
+        }, 2000)
+      }
+
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+          warehousing_count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+          number: [
+            { required: true, message: '批号不能为空', trigge: 'blur' }
+          ],
+          good_id: [
+            { validator: checkGoodId, trigger: 'blur' }
+          ]
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+
+        total: '',
+        product_date: '',
+        expiry_date: '',
+        numbers: '',
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库',
+          isCreated: 1
+
+        },
+
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+        warehouse: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+  },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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['id'] = 0
+              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_id'] = val.selectedGoodInfo[i].id
+              tempForm['number'] = ''
+              tempForm['product_date'] = ''
+              tempForm['expiry_date'] = ''
+              tempForm['warehousing_count'] = ''
+              tempForm['price'] = ''
+              tempForm['remark'] = ''
+              tempForm['dealer'] = ''
+              tempForm['manufacturer'] = ''
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      },  GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodType = response.data.data.goodType
+            this.goodInfo = response.data.data.goodInfo
+          }
+        })
+
+      }, typeName: function(good_type_id) {
+        let name = '请输入物品类型'
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['number'] = ''
+        tempObj['product_date'] = ''
+        tempObj['expiry_date'] = ''
+        tempObj['warehousing_count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        tempObj['dealer'] = ''
+        tempObj['manufacturer'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该入库物品信息记录?', '删除入库物品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            DeleteWarehouseInfoItem(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '删除成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      },  getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+          this.$message.error('请先选择厂商')
+          return
+        } else {
+          this.isVisibility = true
+          const params = {
+            id: this.form.manufacturer
+          }
+          GetAllGoodInfoByID(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.goodInfo.length == 0) {
+                this.$message.error('该厂商没商品，请添加商品')
+              } else {
+                for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+                  this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                }
+
+                const obj = {}
+                this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+                  obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+                  return cur
+                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+              }
+            }
+          })
+        }
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'stockIn': this.recordInfo.recordData
+            }
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '入库成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getWarehouseInfoList(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.info.length; i++) {
+              response.data.data.info[i].product_date = this.getTime(response.data.data.info[i].product_date, '{y}-{m}-{d}')
+              response.data.data.info[i].expiry_date = this.getTime(response.data.data.info[i].expiry_date, '{y}-{m}-{d}')
+              response.data.data.info[i].price = response.data.data.info[i].price.toString()
+              response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString()
+
+              this.recordInfo.recordData.push(response.data.data.info[i])
+            }
+
+            this.warehouse = response.data.data.warehousing
+            this.form.manufacturer = this.warehouse.manufacturer
+            this.form.dealer = this.warehouse.dealer
+            this.warehousing_time = this.getTime(this.warehouse.warehousing_time, '{y}-{m}-{d}')
+          }
+        })
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/stockOutDetail.vue

@@ -0,0 +1,24 @@
+<template>
+  <stock-out-order-detail v-if="isEdit == 0"   v-on:edit-record="isEdit = 1"></stock-out-order-detail>
+  <stock-out-edit v-else></stock-out-edit>
+</template>
+
+<script>
+  import StockOutOrderDetail from './stockOutOrderDetail'
+  import StockOutEdit from './stockOutOrderEdit'
+  export default {
+    name: 'stockInDeatail',
+    components: { StockOutEdit, StockOutOrderDetail},
+    data() {
+      return {
+        isEdit: 0
+      }
+    }
+
+  }
+
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/stock/stockOutOrder.vue

@@ -0,0 +1,406 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+
+    <div class="filter-container">
+
+
+      <el-row style="float:right;">
+        <el-button @click="AddNewOrder" type="primary">新增</el-button>
+      </el-row>
+    </div>
+
+    <div class="filter-container" style="margin-top:20px">
+      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+    </div>
+
+    <div class="filter-container">
+      <span>入库时间:</span>
+      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+      <span class="">-</span>
+      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+      <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="warehouseOutDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%" border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+
+      >
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.warehouse_out_time | parseTime('{y}-{m}-{d}')}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.warehouse_out_order_number}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{getXuserName(scope.row.creater)}}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="厂家" align="center">
+          <template slot-scope="scope">
+            {{getManufactuerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="经销商" align="center">
+          <template slot-scope="scope">
+            {{getDealerName(scope.row.dealer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+
+          </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 {
+    deleteWarehouseOut,
+    GetAllConfig,
+    getWarehouseOutList,
+  } from '@/api/stock'
+
+  export default {
+    name: 'salesReturnOrder',
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetWarehouseOut()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        warehouseOutDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: [],
+
+      }
+    },
+    methods: {
+      AddNewOrder:function(){
+        this.$router.push({ name: 'stockOutOrderAdd'})
+      },
+      GetWarehouseOut: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time
+        }
+        this.warehouseOutDate = []
+        getWarehouseOutList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.warehouseOutDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetWarehouse()
+      }, endTimeChange(val) {
+        this.GetWarehouse()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'stockOutDetail', query: { id: row.id }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseOut(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.warehouseOutDate.length; y++) {
+                  if (ids[i] == this.warehouseOutDate[y].id) {
+                    this.warehouseOutDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseOut(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.warehouseOutDate.length; y++) {
+                  if (ids[i] == this.warehouseOutDate[y].id) {
+                    this.warehouseOutDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -0,0 +1,442 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                         :visibility="isVisibility"
+                         v-on:dialog-comfirm="comfirm"
+                         v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8"><div>
+          <span>退货时间:</span>
+          <el-date-picker v-model="warehouse_out_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"></el-date-picker>
+        </div></el-col>
+
+
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
+              <el-form-item label="厂商：" prop="manufacturer">
+                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
+                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div>
+            <el-form ref="form" :model="form" label-width="80px">
+              <el-form-item label="经销商：">
+                <el-select v-model="form.dealer" placeholder="请选择经销商">
+                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+      </el-row>
+
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope" >
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+                <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型"  v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item  style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称"  v-model="scope.row.good_id" :value="specificationName(scope.row.good_id)" @focus="showDialog(scope.$index, scope.row)" ></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>单价<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.price" ></el-input>
+                </el-form-item>
+
+
+              </template>
+            </el-table-column>
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>出库数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="总价" min-width="20" align="center">
+              <template slot-scope="scope">
+                {{calculate(scope.row.price*scope.row.count)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="20" align="center">
+              <template slot-scope="scope">
+                <el-input  v-model="scope.row.remark"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import {
+    getSalesReturnConfig,
+    postWarehouseOut,
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog},
+    name: 'salesReturnOrderAdd',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehouse_out_time: '',
+        currentIndex: 0,
+        recordInfo: {
+          recordData: [],
+        },
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+          count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+
+        },
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+        },
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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['count'] = ''
+              tempForm['price'] = ''
+              tempForm['remark'] = ''
+
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getSalesReturnConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseList =  response.data.data.warehouseList
+            var warehouseInfoList =  response.data.data.warehouseInfoList
+            for (let i = 0; i <warehouseList.length; i++ ){
+              if(warehouseList[i].Manufacturer.id > 0){
+                this.manufacturer.push(warehouseList[i].Manufacturer)
+              }
+              if(warehouseList[i].Dealer.id > 0){
+                this.dealer.push(warehouseList[i].Dealer)
+              }
+            }
+            for (let i = 0; i < warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
+
+            }
+            const obj = {}
+            const obj2 = {}
+            const obj4 = {}
+            //去重复
+            this.manufacturer =  this.manufacturer.reduce((cur, next) => {
+              obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            //去重复
+            this.dealer =  this.dealer.reduce((cur, next) => {
+              obj2[next.id] ? '' : obj2[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+
+
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+
+
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        this.recordInfo.recordData.splice(index, 1)
+      }, calculate: function(val) {
+        if(isNaN(val)){
+          return ''
+        }
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+          this.$message.error('请先选择厂商')
+          return
+        } else {
+          this.isVisibility = true
+          console.log(this.form.manufacturer)
+          for (let i = 0; i < this.propForm.goodInfo.length; i++){
+            if(this.propForm.goodInfo[i].manufacturer == this.form.manufacturer){
+              this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+            }
+
+          }
+          const obj3 = {}
+          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+            return cur
+          }, [])
+
+
+
+        }
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            if (this.form.manufacturer == 0) {
+              this.$message.error('厂商不能为空')
+              return
+            }
+            const array = this.recordInfo.recordData
+            let total = 0
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+              total = total + array[i].price * array[i].return_count
+            }
+            const params = {
+              'stockOut': this.recordInfo.recordData
+            }
+            console.log(this.form.dealer)
+
+
+            postWarehouseOut(params,this.warehouse_out_time,this.form.dealer,this.form.manufacturer).then(response=>{
+              if (response.data.state==0) {
+                this.$message.error(response.data.msg);
+                return false;
+              }else {
+                this.$notify({
+                  title: "成功",
+                  message: "退货成功",
+                  type: "success",
+                  duration: 2000
+                });
+                this.recordInfo.recordData = []
+                this.$router.back(-1)
+              }
+            });
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.warehouse_out_time = endTime
+      const tempObj = {}
+      tempObj['good_type_id'] = 0
+      tempObj['good_id'] = 0
+      tempObj['return_count'] = 0
+      tempObj['price'] = ''
+      tempObj['remark'] = ''
+
+      this.recordInfo.recordData.push(tempObj)
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -0,0 +1,258 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <div class="filter-container">
+      <span style="font-size: 20px">退货单详情</span>
+      <el-row style="float:right;">
+        <span>{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+      </el-row>
+    </div>
+
+
+
+    <div class="filter-container">
+      <span>单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span>厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
+      <span>经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
+    </div>
+
+    <div class="filter-container" style="margin-top: 10px">
+      <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
+      <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%" border
+      >
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>物品类型</span>
+          </template>
+
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>规格名称</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>单价</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.price}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column min-width="23" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>出库数量</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{scope.row.count}}</span>
+
+          </template>
+        </el-table-column>
+        <el-table-column label="总价" min-width="20" align="center">
+          <template slot-scope="scope">
+            {{calculate(scope.row.price*scope.row.count)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="备注" min-width="20"  align="center">
+          <template slot-scope="scope">
+            <el-popover placement="top-start"  width="250" trigger="hover" >
+              <div>{{scope.row.remark}}</div>
+              <span slot="reference" v-if="scope.row.remark.length > 20">{{ scope.row.remark.substr(0,20)+'...' }}</span>
+              <span slot="reference" v-else>{{ scope.row.remark}}</span>
+            </el-popover>
+
+          </template>
+        </el-table-column>
+
+
+      </el-table>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { GetAllConfig,getWarehouseOutInfo,deleteWarehouseOut } from '@/api/stock'
+
+  export default {
+    name: 'stockInOrderDetail',
+    created() {
+      const order_id = this.$route.query.id
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+    },
+    data() {
+      return {
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        warehousingOutInfo: {
+          loading: false,
+          warehousingOutData: [],
+          info: {}
+        }
+      }
+    },
+    methods: {
+      getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      }, getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+            this.goodType = response.data.data.goodType
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getWarehouseOutInfo(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.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
+            }
+            this.warehousingOutInfo.info = response.data.data.info
+          }
+        })
+      }, deleteRecord: function() {
+        const ids = []
+        ids.push(this.warehousingOutInfo.info.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除退货单?', '删除退货单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseOut(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
+      }, editRecord: function() {
+        this.$emit('edit-record')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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 .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -0,0 +1,425 @@
+<template>
+
+  <div class="app-container sign-and-weigh-box">
+
+    <sales-return-dialog :propForm="propForm"
+                     :visibility="isVisibility"
+                     v-on:dialog-comfirm="comfirm"
+                     v-on:dialog-cancle="cancle"></sales-return-dialog>
+
+    <div class="filter-container">
+
+      <el-row>
+        <el-col :span="8">
+          <div>
+            <span>入库时间:</span>
+            <el-date-picker v-model="warehouse_out_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"></el-date-picker>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-row>
+      <el-col>
+        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+          <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                    max-height="450"
+          >
+
+            <el-table-column label="操作" align="center" min-width="30">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="handleEdit(scope.$index, scope.row)">+
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDelete(scope.$index, scope.row)">-
+                </el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="35" align="center">
+
+              <template slot="header" slot-scope="scope">
+                <span>物品类型<span style="color: red">*</span></span>
+              </template>
+
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                            :value="typeName(scope.row.good_type_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+
+                <el-form-item style="padding-top: 15px">
+                  <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                            :value="specificationName(scope.row.good_id)"
+                            @focus="showDialog(scope.$index, scope.row)"></el-input>
+                </el-form-item>
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>单价<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+                <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.price" ></el-input>
+                </el-form-item>
+
+
+              </template>
+            </el-table-column>
+
+            <el-table-column  min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>出库数量<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count' style="padding-top: 17px">
+                  <el-input type="number"  v-model="scope.row.count" ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="总价" min-width="20" align="center">
+              <template slot-scope="scope">
+                {{calculate(scope.row.price*scope.row.count)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="20" align="center">
+              <template slot-scope="scope">
+                <el-input  v-model="scope.row.remark"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </el-col>
+
+
+      <span class="dialog-footer" style="margin-top: 20px;float:right">
+        <el-button @click="back()">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </span>
+
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  import {
+    deleteWarehouseOutInfo,
+    getWarehouseOutInfo,
+    getSalesReturnConfig,
+    editWarehouseoutInfo
+  } from '@/api/stock'
+  import SalesReturnDialog from './Dialog/salesReturnDialog'
+
+  export default {
+    components: { SalesReturnDialog},
+    name: 'salesReturnEdit',
+
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+
+        adminUserOptions: null,
+        currentIndex: 0,
+        warehouse_out_time: '',
+        recordInfo: {
+          recordData: [],
+          stock_in_code: '',
+          current_index: ''
+
+        },
+        tableRules: {
+          count: [
+            { required: true, message: '数量不能为空', trigge: 'blur' }
+          ],
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+
+        },
+        ruleForm: {
+          manufacturer: [
+            { required: true, message: '请选择厂商', trigger: 'change' }
+          ]
+        },
+        // prop
+        isVisibility: false,
+        propForm: {
+          goodType: [],
+          goodInfo: [],
+          goodUnit: [],
+          title: '入库'
+        },
+
+        form: {
+          manufacturer: '',
+          dealer: ''
+        },
+
+        warehouseOut: {},
+        manufacturer: [],
+        dealer: [],
+        goodType: []
+      }
+    },
+    methods: {
+      comfirm: function(val) {
+        this.isVisibility = false
+        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['id'] = 0
+              tempForm['good_type_id'] = val.goodTypeId
+              tempForm['good_id'] = val.selectedGoodInfo[i].id
+              tempForm['count'] = ''
+              tempForm['price'] = ''
+              tempForm['remark'] = ''
+
+              this.recordInfo.recordData.push(tempForm)
+            }
+          }
+        }
+
+        this.currentIndex = -1
+      }, cancle: function() {
+        this.isVisibility = false
+      }, GetConfigInfo: function() {
+        getSalesReturnConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var warehouseInfoList = response.data.data.warehouseInfoList
+            for (let i = 0; i < warehouseInfoList.length; i++) {
+              this.propForm.goodInfo.push(warehouseInfoList[i].GoodInfo)
+              this.propForm.goodType.push(warehouseInfoList[i].GoodInfo.GoodsType)
+
+            }
+            const obj3 = {}
+            const obj4 = {}
+            this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+              obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+            this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+              obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+              return cur
+            }, [])
+          }
+        })
+      }, typeName: function(good_type_id) {
+        let name = ''
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          if (this.propForm.goodType[i].id == good_type_id) {
+            name = this.propForm.goodType[i].type_name
+          }
+        }
+        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
+          }
+        }
+        return name
+      }, handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        this.recordInfo.recordData.push(tempObj)
+      }, handleDelete: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该退货物品信息记录?', '删除退货物品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteWarehouseOutInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '删除成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      }, getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      }, showDialog(index, row) {
+        this.currentIndex = index
+
+        this.isVisibility = true
+        console.log(this.form.manufacturer)
+        for (let i = 0; i < this.propForm.goodInfo.length; i++) {
+          if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
+            this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
+          }
+        }
+        const obj3 = {}
+        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+      }, back() {
+        this.$router.go(-1)
+      }, submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('物品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'stockOut': this.recordInfo.recordData
+            }
+            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '退货成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.$router.back(-1)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getWarehouseOutInfo(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++) {
+              response.data.data.list[i].price = response.data.data.list[i].price.toString()
+              response.data.data.list[i].count = response.data.data.list[i].count.toString()
+              this.recordInfo.recordData.push(response.data.data.list[i])
+            }
+            this.warehouseOut = response.data.data.info
+            this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
+
+          }
+
+        })
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }
+    },
+    created() {
+      this.GetConfigInfo()
+      this.propForm.goodUnit = this.$store.getters.good_unit
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+    }
+
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    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;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>