修改配置

src/api/stock.js

@@ -251,9 +251,9 @@ export function GetAllGoodInfo(params){
   })
 }
 
-export function postWarehouse(params,warehousing_time,manufacturer_id,dealer_id){
+export function postWarehouse(params,warehousing_time,manufacturer_id,dealer_id,type){
   return request({
-    url:'/api/stock/warehouse/create?warehousing_time='+warehousing_time+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url:'/api/warehouse/create?warehousing_time='+warehousing_time+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id+"&type="+type,
     method:'post',
     data:params
   })
@@ -262,7 +262,7 @@ export function postWarehouse(params,warehousing_time,manufacturer_id,dealer_id)
 
 export function getWarehouseList(params){
   return request({
-    url:'/api/stock/warehouse/list',
+    url:'/api/warehouse/list',
     method:'get',
     params:params
   })
@@ -270,16 +270,16 @@ export function getWarehouseList(params){
 
 export function getWarehouseInfoList(params){
   return request({
-    url:'/api/stock/warehouseinfo/list',
+    url:'/api/warehouseinfo/list',
     method:'get',
     params:params
   })
 }
 
 
-export function postSalesReturn(params,salesReturnTime,salesReturnTotal,dealer_id,manufacturer_id){
+export function postSalesReturn(params,salesReturnTime,salesReturnTotal,dealer_id,manufacturer_id,type){
   return request({
-    url:'/api/warehouse/return?time='+salesReturnTime+"&total="+salesReturnTotal+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id,
+    url:'/api/salesreturn/create?time='+salesReturnTime+"&total="+salesReturnTotal+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id+"&type="+type,
     method:'post',
     data:params
   })
@@ -297,7 +297,7 @@ export function getWarehouseInfo(params){
 
 export function getSalesReturnList(params){
   return request({
-    url:'/api/return/list',
+    url:'/api/salesreturn/list',
     method:'get',
     params:params
   })
@@ -333,9 +333,9 @@ export function getWarehouseOutInfoList(params){
 }
 
 
-export function postWarehouseOut(params,warehousing_time,dealer_id,manufacturer_id){
+export function postWarehouseOut(params,warehousing_time,dealer_id,manufacturer_id,type){
   return request({
-    url:'/api/warehouseout/create?warehousing_out_time='+warehousing_time+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id,
+    url:'/api/warehouseout/create?warehousing_out_time='+warehousing_time+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id+"&type="+type,
     method:'post',
     data:params
   })
@@ -401,7 +401,7 @@ export function getWarehouseInfoByOrdeNumber(params){
 
 export function modifyWarehouseInfo(params){
   return request({
-    url:'/api/stock/warehouse/edit',
+    url:'/api/warehouse/edit',
     method:'post',
     params:params
   })
@@ -410,7 +410,7 @@ export function modifyWarehouseInfo(params){
 
 export function deleteWarehouseInfo(params){
   return request({
-    url:'/api/stock/warehouse/delete',
+    url:'/api/warehouse/delete',
     method:'post',
     params:params
   })
@@ -437,15 +437,6 @@ 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',
@@ -465,7 +456,7 @@ export function GetAllGoodInfoByID(params){
 
 export function DeleteWarehouseInfoItem(params){
   return request({
-    url:'/api/stock/warehouseinfo/delete',
+    url:'/api/warehouseinfo/delete',
     method:'post',
     params:params
 
@@ -476,7 +467,7 @@ export function DeleteWarehouseInfoItem(params){
 
 export function EditWarehouse(params,warehousing_time,id){
   return request({
-    url:'/api/stock/warehouse/edit?warehousing_time='+warehousing_time+'&id='+id,
+    url:'/api/warehouse/edit?warehousing_time='+warehousing_time+'&id='+id,
     method:'post',
     data:params
   })
@@ -492,7 +483,7 @@ export function getSalesReturnConfig(){
 
 export function deleteSalesReturn(params){
   return request({
-    url:'/api/return/delete',
+    url:'/api/salesreturn/delete',
     method:'post',
     params:params
   })
@@ -510,14 +501,14 @@ export function getSaleReturnInfoList(params){
 
 export function getReturnList(params){
   return request({
-    url:'/api/return/info/list',
+    url:'/api/salesreturninfo/list',
     method:'get',
     params:params
   })
 }
 export function deleteSalesReturnInfo(params){
   return request({
-    url:'/api/return/info/delete',
+    url:'/api/salesreturninfo/delete',
     method:'post',
     params:params
   })
@@ -527,7 +518,7 @@ export function deleteSalesReturnInfo(params){
 
 export function editSalesReturnInfo(params,return_time,id){
   return request({
-    url:'/api/return/edit?return_time='+return_time+"&id="+id,
+    url:'/api/salesreturn/edit?return_time='+return_time+"&id="+id,
     method:'post',
     data:params
   })
@@ -624,9 +615,9 @@ export function deleteCancelStockInfo(params){
   })
 }
 
-export function postCancelStock(params,cancelStockTime,manufacturer_id,dealer_id){
+export function postCancelStock(params,cancelStockTime,manufacturer_id,dealer_id,type){
   return request({
-    url:'/api/cancelstock/create?time='+cancelStockTime+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url:'/api/cancelstock/create?time='+cancelStockTime+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id+"&type="+type,
     method:'post',
     data:params
   })

src/lang/zh.js

@@ -141,7 +141,7 @@ export default {
     stockOutOrder:"出库单",
     cancelStockOrder:"出库退库单",
     otherStockInOrder:"其他入库单",
-    otherSalesReturnOrder:"其退货单",
+    otherSalesReturnOrder:"其他退货单",
     otherStockOutOrder:"其他出库单",
     otherCancelStockOrder:"其他出库退库单",
 

src/xt_pages/stock/Dialog/stockOutDetailDialog.vue

@@ -1,13 +0,0 @@
-<template>
-
-</template>
-
-<script>
-    export default {
-        name: "stock-out-detail-dialog"
-    }
-</script>
-
-<style scoped>
-
-</style>

src/xt_pages/stock/Dialog/stockOutDialog.vue

@@ -1,256 +0,0 @@
-<template>
-  <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
-             :close-on-press-escape="isClose">
-
-    <el-form :model="propForm.formValue" class="demo-form-inline" style="height: 300px"
-             :rules="rules" :v-model="propForm.formValue" ref="formValue"
-             label-width="140px">
-      <el-col :span="size">
-        <el-form-item label="物品类型:" prop="good_type_id">
-          <el-select v-model="propForm.formValue.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="propForm.formValue.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="库存数量:">
-          <el-input type="number" v-model="warehouse_count" :disabled="isDisabled"></el-input>
-        </el-form-item>
-      </el-col>
-
-
-      <el-col :span="size">
-        <el-form-item label="出库数量:" prop="count">
-          <el-input type="number" v-model="propForm.formValue.count"></el-input>
-        </el-form-item>
-      </el-col>
-
-      <el-col>
-        <el-form-item label="备注 : " prop="remark">
-          <el-input type="textarea" :row="5" v-model="propForm.formValue.remark"
-                    placeholder="请输入内容">
-          </el-input>
-        </el-form-item>
-      </el-col>
-    </el-form>
-
-
-    <span slot="footer" class="dialog-footer">
-    <el-button v-if="propForm.isCreated == 3" @click="cancle('formValue')">取 消</el-button>
-    <el-button v-if="propForm.isCreated != 3 " @click="cancle('formValue')">取 消</el-button>
-    <el-button v-if="propForm.isCreated != 3" type="primary" @click="comfirm('formValue')">确 定</el-button>
-  </span>
-  </el-dialog>
-
-</template>
-
-<script>
-  import {
-    GetAllGoodInfo,
-    GetAllGoodType,
-    getWarehouseInfoCountByGoodId,
-    getWarehouseInfoByGoodTypeId,
-  } from "@/api/stock";
-
-  export default {
-    name: "stockOutDialog",
-    data() {
-      var checkCount = (rule, value, callback) => {
-        if (parseInt(value) > this.warehouse_count) {
-          return callback(new Error('出库数量不能大于库存数量'));
-        }
-        if (value < 0) {
-          return callback(new Error('出库数量不能为负数'));
-        }
-
-      };
-
-
-      return {
-        remark:'',
-        isDisabled: true,
-        warehouse_count: '',
-        tempGoodType: [],
-        tempGoodInfo: [],
-        isClose: false,
-        size: 11,
-        isShow: true,
-        rules: {
-          good_id: [
-            {required: true, message: '请选择物品类型', trigger: 'change'}
-          ],
-          good_type_id: [
-            {required: true, message: '请选择规格名称', trigger: 'change'}
-          ],
-          count: [
-            {required: true, message: '请输入出库数量', trigger: 'blur'},
-            {validator: checkCount, trigger: 'blur'},
-            // {validator: checkIsInt, trigger: 'blur'}
-
-          ]
-        }
-      }
-    },
-    props: {
-      propForm: {
-        type: Object
-      },
-      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 () {
-        console.log(this.remark)
-        let form = {}
-        form['good_type_id'] = this.propForm.formValue.good_type_id
-        form['good_id'] = this.propForm.formValue.good_id
-        form['product_date'] = this.propForm.formValue.product_date
-        form['expiry_date'] = this.propForm.formValue.expiry_date
-        form['warehousing_count'] = this.warehouse_count
-        form['count'] = this.propForm.formValue.count
-        form['price'] = this.propForm.formValue.price
-        if(typeof this.propForm.formValue.remark == 'undefined'){
-          form['remark'] = this.remark
-        }else{
-          form['remark'] = this.propForm.formValue.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
-          }
-        }
-        return form
-      }, goodTypeSelect: function (id) {
-        this.propForm.formValue.good_id = ''
-
-        this.tempGoodInfo = []
-        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])
-          }
-        }
-        let params = {
-          "good_type_id": id
-        }
-        getWarehouseInfoByGoodTypeId(params).then(response => {
-          if (response.data.state == 0) {
-            this.warehouse_count = ''
-            this.tempGoodInfo = []
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.warehouse_count = ''
-
-          }
-        })
-
-      }, 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.propForm.formValue.good_type_id = this.propForm.goodInfo[index].good_type_id
-        let params = {
-          "good_id": this.propForm.goodInfo[index].id
-
-        }
-        getWarehouseInfoCountByGoodId(params).then(response => {
-          if (response.data.state == 0) {
-            this.warehouse_count = ''
-            this.propForm.formValue.good_type_id = ''
-            this.$message.error(response.data.msg);
-
-            return false;
-          } else {
-            this.warehouse_count = ''
-            this.warehouse_count = response.data.data.warehousing_count
-            this.propForm.formValue.price = response.data.data.price
-          }
-        })
-      }
-    },
-    watch: {
-      visibility(val) {
-
-        this.tempGoodInfo = this.propForm.goodInfo
-        this.tempGoodType = this.propForm.goodType
-        if(this.propForm.isCreated == 2 ||this.propForm.isCreated == 3) {
-          let params = {
-            "good_id": this.propForm.formValue.good_id
-          }
-          getWarehouseInfoCountByGoodId(params).then(response => {
-            if (response.data.state == 0) {
-              this.warehouse_count = ''
-              this.propForm.formValue.good_type_id = ''
-              this.$message.error(response.data.msg);
-
-              return false;
-            } else {
-              this.warehouse_count = ''
-              this.warehouse_count = response.data.data.warehousing_count
-              this.propForm.formValue.price = response.data.data.price
-            }
-          })
-        }else{
-          this.warehouse_count = ''
-
-
-        }
-
-
-        !val && setTimeout(() => {
-          this.$refs['formValue'].resetFields();
-
-
-        }, 0);
-      }
-    }
-  }
-
-</script>
-
-<style scoped>
-
-</style>

src/xt_pages/stock/cancelStockOrder.vue

@@ -156,6 +156,7 @@
     },
     data() {
       return {
+        type:1,
         page: 1,
         limit: 7,
         checked: false,
@@ -185,7 +186,8 @@
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          type: this.type,
         }
         this.cancelStockDate = []
         getCancelStockList(Params).then(response => {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -137,6 +137,7 @@
 
     data() {
       return {
+        type:2,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         return_time: '',
         currentIndex: 0,
@@ -321,7 +322,7 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            postCancelStock(params,this.return_time,this.form.manufacturer,this.form.dealer).then(response=>{
+            postCancelStock(params,this.return_time,this.form.manufacturer,this.form.dealer,this.type).then(response=>{
               if (response.data.state==0) {
                 this.$message.error(response.data.msg);
                 return false;

src/xt_pages/stock/cancelStockRecord.vue

@@ -1,383 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-
-    <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>
-      <el-row style="float:right;">
-        <el-button @click="handleBack">返回</el-button>
-      </el-row>
-
-    </div>
-
-
-    <el-row :gutter="12">
-      <el-col :span="8">
-        <div class="title">出库退库记录
-        </div>
-        <div style="margin-bottom: 10px;">
-        </div>
-        <el-table :data="cancelStock.cancelStockDate" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  @row-click="onRowClick"
-                  :row-class-name="tableRowClassName"
-                  highlight-current-row
-                  v-loading="cancelStock.loading"
-        >
-          <el-table-column label="退库单号" min-width="40" align="center">
-            <template slot-scope="scope">
-              {{scope.row.order_number}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="操作时间" min-width="40" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.opera_time | parseTime("{y}-{m}-{d}")}}
-            </template>
-          </el-table-column>
-          <el-table-column label="退库总量" align="center" min-width="30">
-            <template slot-scope="scope">
-              {{scope.row.total}}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="操作人" align="center" min-width="30">
-            <template slot-scope="scope">
-              {{getXuserName(scope.row.creater)}}
-            </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;"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
-        </el-pagination>
-      </el-col>
-
-      <el-col :span="16">
-        <div class="title">物品详细信息
-        </div>
-        <el-table :data="cancelStockInfo.cancelStockInfoDate" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  v-loading="cancelStockInfo.loading"
-                  @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="selection"
-            width="55">
-          </el-table-column>
-          <el-table-column label="规格名称" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{getSpecificationName(scope.row.good_id)}}
-            </template>
-          </el-table-column>
-          <el-table-column label="物品类型" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{getTypeName(scope.row.good_type_id)}}
-
-            </template>
-          </el-table-column>
-
-          <el-table-column label="退库数量" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.count}}
-            </template>
-          </el-table-column>
-          <el-table-column label="退库单价" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.price}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="退库总价" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.price * scope.row.count }}
-            </template>
-          </el-table-column>
-        </el-table>
-
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-  import {uParseTime} from "@/utils/tools";
-  import { fetchAllDoctorAndNurse,fetchAllAdminUsers } from "@/api/doctor";
-  import {
-    getCancelStockList,
-    getCancelStockInfoList,
-    GetAllGoodInfo,
-    GetAllGoodType,
-  } 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;
-      }
-      let 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;
-      }
-      let startTime = year + '-' + month + '-' + day;
-      this.start_time = startTime
-
-      this.GetAllGoodInfo()
-      this.GetAllGoodType()
-      this.GetCancelStockList()
-      this.fetchAllAdminUsers()
-
-    },
-    data() {
-      return {
-        adminUserOptions:[],
-        multipleSelection: [],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        end_time: '',
-        goodType:[],
-        goodInfo:[],
-
-        cancelStock: {
-          loading: false,
-          cancelStockDate: [],
-          tableCurrentIndex:''
-        },
-
-        cancelStockInfo: {
-          loading: false,
-          cancelStockInfoDate: [],
-        },
-
-      };
-    },
-    methods: {
-      GetCancelStockList:function () {
-        let Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time
-        }
-        this.cancelStock.cancelStockDate = []
-        getCancelStockList(Params).then(response =>{
-          if (response.data.state == 0) {
-            this.cancelStock.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.cancelStock.loading = false
-            this.total = response.data.data.total
-
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.cancelStock.cancelStockDate.push(response.data.data.list[i])
-            }
-          }
-        })
-      },  tableRowClassName({row, rowIndex}) {
-        //把每一行的索引放进row
-        row.index = rowIndex;
-
-      }, onRowClick(row, event, column) {
-        this.cancelStockInfo.cancelStockInfoDate = []
-        this.cancelStock.tableCurrentIndex = row.index;
-        let params = {
-          'id': row.id
-        }
-        this.cancelStockInfo.loading = true
-        getCancelStockInfoList(params).then(response => {
-          if (response.data.state == 0) {
-            this.cancelStockInfo.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.cancelStockInfo.loading = false
-            for (let i = 0; i < response.data.data.info.length; i++) {
-              this.cancelStockInfo.cancelStockInfoDate.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 => {
-          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])
-            }
-          }
-        });
-
-
-      },handleSelectionChange:function (val) {
-        this.multipleSelection = val
-      },handleBack: function () {
-        this.$router.go(-1)
-      },startTimeChange(val) {
-      this.GetWarehouse();
-    }, endTimeChange(val) {
-      this.GetWarehouse();
-    }
-
-
-    },
-    watch: {
-      $route() {
-        if (this.$route.path == '/stock/in') {
-
-
-        }
-
-      }
-    }
-  };
-</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;
-  }
-
-  .count{
-    color: #bd2c00;
-
-  }
-
-</style>

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -156,6 +156,7 @@
     },
     data() {
       return {
+        type: 2,
         page: 1,
         limit: 7,
         checked: false,
@@ -185,7 +186,8 @@
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          type: this.type,
         }
         this.cancelStockDate = []
         getCancelStockList(Params).then(response => {

src/xt_pages/stock/otherCancelStockOrderAdd.vue

@@ -140,6 +140,7 @@
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         return_time: '',
         currentIndex: 0,
+        type:2,
         recordInfo: {
           recordData: [],
         },
@@ -321,7 +322,7 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            postCancelStock(params,this.return_time,this.form.manufacturer,this.form.dealer).then(response=>{
+            postCancelStock(params,this.return_time,this.form.manufacturer,this.form.dealer,this.type).then(response=>{
               if (response.data.state==0) {
                 this.$message.error(response.data.msg);
                 return false;

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -158,6 +158,7 @@
     },
     data() {
       return {
+        type:2,
         page: 1,
         limit: 7,
         checked: false,
@@ -187,7 +188,8 @@
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          type: this.type,
         }
         this.saleReturnDate = []
         getSalesReturnList(Params).then(response => {

src/xt_pages/stock/otherSalesReturnOrderAdd.vue

@@ -140,6 +140,7 @@
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         return_time: '',
         currentIndex: 0,
+        type:2,
         recordInfo: {
           recordData: [],
         },
@@ -326,7 +327,7 @@
             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            postSalesReturn(params,this.return_time,total,this.form.dealer,this.form.manufacturer).then(response=>{
+            postSalesReturn(params,this.return_time,total,this.form.dealer,this.form.manufacturer,this.type).then(response=>{
               if (response.data.state==0) {
                 this.$message.error(response.data.msg);
                 return false;

src/xt_pages/stock/otherStockInOrder.vue

@@ -176,6 +176,7 @@
         manufacturer: [],
         selectedTableData: [],
         dealer: [],
+        type: 2,
         Warehouse: {
           loading: false,
           warehouseDate: [],
@@ -194,7 +195,8 @@
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          type : this.type,
         }
         this.Warehouse.warehouseDate = []
         getWarehouseList(Params).then(response => {

src/xt_pages/stock/otherStockInOrderAdd.vue

@@ -246,6 +246,8 @@
         expiry_date: '',
         numbers: '',
 
+        type: 2,
+
         // prop
         isVisibility: false,
         propForm: {
@@ -517,7 +519,7 @@
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer).then(response => {
+            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer,this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/otherStockOutDetail.vue

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

src/xt_pages/stock/otherStockOutOrder.vue

@@ -1,13 +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="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: 'otherStockOutOrder'
+    name: 'otherStockOutOrder',
+    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: [],
+        type:2,
+
+      }
+    },
+    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,
+          type: this.type,
+        }
+        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 scoped>
+<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/otherStockOutOrderAdd.vue

@@ -1,13 +1,443 @@
 <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 {
-    name: 'otherStockOutOrderAdd'
+    components: { SalesReturnDialog},
+    name: 'otherStockOutOrderAdd',
+
+    data() {
+      return {
+        type:2,
+        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,this.type).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 scoped>
+<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/otherStockOutOrderDetail.vue

@@ -1,13 +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: 'otherStockOutOrderDetail'
+    name: 'otherStockOutOrderDetail',
+    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 scoped>
+<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/otherStockOutOrderEdit.vue

@@ -1,13 +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 {
-    name: 'otherStockOutOrderEdit'
+    components: { SalesReturnDialog},
+    name: 'otherStockOutOrderEdit',
+
+    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 scoped>
+<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

@@ -158,6 +158,7 @@
     },
     data() {
       return {
+        type: 1,
         page: 1,
         limit: 7,
         checked: false,
@@ -187,7 +188,8 @@
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          type:this.type,
         }
         this.saleReturnDate = []
         getSalesReturnList(Params).then(response => {

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -137,6 +137,7 @@
 
     data() {
       return {
+        type:1,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         return_time: '',
         currentIndex: 0,
@@ -326,7 +327,7 @@
             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            postSalesReturn(params,this.return_time,total,this.form.dealer,this.form.manufacturer).then(response=>{
+            postSalesReturn(params,this.return_time,total,this.form.dealer,this.form.manufacturer,this.type).then(response=>{
               if (response.data.state==0) {
                 this.$message.error(response.data.msg);
                 return false;

src/xt_pages/stock/stockInOrder.vue

@@ -194,7 +194,8 @@
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          type : 1,
         }
         this.Warehouse.warehouseDate = []
         getWarehouseList(Params).then(response => {

src/xt_pages/stock/stockInOrderAdd.vue

@@ -10,12 +10,15 @@
     <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>
+            <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">
@@ -23,7 +26,8 @@
             <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-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>
@@ -34,7 +38,8 @@
             <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-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>
@@ -46,7 +51,7 @@
 
     <el-row>
       <el-col>
-        <el-form  :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
           <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
                     max-height="450"
           >
@@ -71,12 +76,14 @@
                 <span>物品类型<span style="color: red">*</span></span>
               </template>
 
-              <template slot-scope="scope" >
+              <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 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>
@@ -87,29 +94,32 @@
               </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 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">
+            <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 :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">
+            <el-table-column min-width="23" align="center">
               <template slot="header" slot-scope="scope">
                 <span>入库数量<span style="color: red">*</span></span>
               </template>
@@ -117,8 +127,9 @@
                 <!--{{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 :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>
@@ -129,21 +140,22 @@
               </template>
             </el-table-column>
 
-            <el-table-column  align="center" min-width="25">
+            <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 :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" >
+              <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"
@@ -154,15 +166,15 @@
             <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"
+                <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>
+                <el-input v-model="scope.row.remark"></el-input>
               </template>
             </el-table-column>
           </el-table>
@@ -170,7 +182,7 @@
       </el-col>
 
 
-      <span  class="dialog-footer" style="margin-top: 20px;float:right">
+      <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>
@@ -183,18 +195,18 @@
   import stockInDialog from './Dialog/stockInDialog'
   import { uParseTime } from '@/utils/tools'
 
-import {
-    GetAllGoodInfo,
-    GetAllGoodType,
-    postWarehouse,
+  import {
+    deleteWarehouseInfo,
     GetAllConfig,
+    GetAllGoodInfo,
     GetAllGoodInfoByID,
+    GetAllGoodType,
     getWarehouseInfoByOrdeNumber,
     modifyWarehouseInfo,
-    deleteWarehouseInfo
+    postWarehouse
   } from '@/api/stock'
 
-export default {
+  export default {
     components: { stockInDialog },
     name: 'stockIn',
 
@@ -240,7 +252,7 @@ export default {
           ]
 
         },
-
+        type: 1,
         total: '',
         product_date: '',
         expiry_date: '',
@@ -298,7 +310,7 @@ export default {
         dealer: [],
         goodType: []
       }
-  },
+    },
     methods: {
       handleSave: function() {
         if (this.recordInfo.recordData.length <= 0) {
@@ -325,7 +337,7 @@ export default {
       }, comfirm: function(val) {
         this.isVisibility = false
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ;i--) {
+          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
@@ -517,7 +529,7 @@ export default {
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer).then(response => {
+            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -579,6 +591,7 @@ export default {
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
+
   }
 
   .title {
@@ -588,7 +601,6 @@ export default {
     padding: 0 0 0 10px;
     color: #fff;
     margin: 0 0 10px 0;
-  // border-radius: 4px 4px 0 0;
   }
 
   .edit_separater {

src/xt_pages/stock/stockOutOrder.vue

@@ -173,6 +173,7 @@
         manufacturer: [],
         selectedTableData: [],
         dealer: [],
+        type:1,
 
       }
     },
@@ -185,7 +186,8 @@
           page: this.page,
           limit: this.limit,
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          type: this.type,
         }
         this.warehouseOutDate = []
         getWarehouseOutList(Params).then(response => {

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -158,6 +158,7 @@
 
     data() {
       return {
+        type:1,
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         warehouse_out_time: '',
         currentIndex: 0,
@@ -353,7 +354,7 @@
             console.log(this.form.dealer)
 
 
-            postWarehouseOut(params,this.warehouse_out_time,this.form.dealer,this.form.manufacturer).then(response=>{
+            postWarehouseOut(params,this.warehouse_out_time,this.form.dealer,this.form.manufacturer,this.type).then(response=>{
               if (response.data.state==0) {
                 this.$message.error(response.data.msg);
                 return false;