修改库存

src/xt_pages/stock/addStockIn.vue

@@ -1,454 +0,0 @@
-<template>
-<div class="main-contain">
-    <div class="position">
-      <bread-crumb></bread-crumb>
-      <el-row style="float:right;">
-        <el-button size="small" icon="el-icon-refresh" @click="handleCancle" >返回</el-button>
-        <el-button size="small" icon="el-icon-circle-plus-outline"    @click="handleCreate" type="primary">添加</el-button>
-      </el-row>
-    </div>
-  <div class="app-container sign-and-weigh-box">
-    <stock-in-dialog :propForm="propForm"
-                     :visibility="isVisibility"
-                     v-on:dialog-comfirm="comfirm"
-                     v-on:dialog-cancle="cancle"></stock-in-dialog>
-
-    <div class="">
-      <div class="cell" style="float:left;">
-        <label class="title"><span class="name">入库时间:</span></label>
-        <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>
-    </div>
-    <el-row>
-      <el-col>
-        <div class="titleTop">入库列表 </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-        >
-          <el-table-column label="物品类型" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{typeName(scope.row.good_type_id)}}
-            </template>
-          </el-table-column>
-          <el-table-column label="规格名称" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{specificationName(scope.row.good_id)}}
-            </template>
-          </el-table-column>
-          <el-table-column label="批号" align="center" min-width="30">
-            <template slot-scope="scope">
-              {{scope.row.number}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="生产日期" min-width="30" align="center">
-            <template slot-scope="scope" v-if="scope.row.product_date != 0">
-              {{scope.row.product_date | parseTime("{y}-{m}-{d}")}}
-            </template>
-          </el-table-column>
-          <el-table-column label="有效日期" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}
-
-            </template>
-          </el-table-column>
-
-          <el-table-column label="入库数量" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.warehousing_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">
-              {{calculate(scope.row.price*scope.row.warehousing_count)}}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" min-width="70">
-            <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="添加" placement="top">
-                <el-button
-                  size="small"
-                  icon="el-icon-circle-plus-outline"
-                  @click="handleEdit(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                <el-button
-                  size="small"
-                  icon="el-icon-delete"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
-                <el-button
-                  size="small"
-                  icon="el-icon-document"
-                  type="primary"
-                  @click="showDetails(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-
-
-    </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-  import stockInDialog from './Dialog/stockInDialog'
-  import {uParseTime} from "@/utils/tools";
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-  import {
-    GetAllGoodInfo,
-    GetAllGoodType,
-    postWarehouse,
-    getWarehouseInfoByOrdeNumber,
-    modifyWarehouseInfo,
-    deleteWarehouseInfo
-  } from "@/api/stock";
-
-  export default {
-    components: {stockInDialog,BreadCrumb},
-    name: "stockIn",
-
-    data() {
-      return {
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        warehousing_time: '',
-        adminUserOptions: null,
-
-        recordInfo: {
-          recordData: [],
-          stock_in_code: '',
-          current_index: '',
-          warehousing_order: '',
-
-        },
-        total: '',
-
-        //prop
-        isVisibility: false,
-        propForm: {
-          goodType: [],
-          goodInfo: [],
-          title: '入库',
-          formValue: {
-            good_type_id: '',
-            good_id: '',
-            number: '',
-            product_date: '',
-            expiry_date: '',
-            warehousing_count: '',
-            price: '',
-            remark: '',
-            dealer: '',
-            manufacturer: ''
-
-          },
-          isCreated: 1,
-
-        },
-
-        goodInfo: {
-          loading: false,
-          goodTypeData: [],
-          type_code: '',
-        }
-
-
-      };
-    },
-    methods: {
-      handleSave: function () {
-        if (this.recordInfo.recordData.length <= 0) {
-          this.$message.error('请添加入库信息');
-          return
-        }
-        sessionStorage.removeItem("warehousing_orders")
-        this.$router.back(-1)
-
-      }, handleCancle: function () {
-        this.$confirm('是否放弃编辑返回上一页?', '放弃编辑', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          sessionStorage.removeItem("warehousing_orders")
-          this.$router.back(-1)
-        }).catch(() => {
-
-        });
-
-      }, handleCreate: function () {
-        this.propForm.formValue = {}
-        this.propForm.isCreated = 1
-        this.isVisibility = true
-
-
-      }, comfirm: function (val) {
-        this.isVisibility = false
-        if (val.isCreated == 2) { //修改
-          val['warehousing_order'] = sessionStorage.getItem("warehousing_orders")
-          modifyWarehouseInfo(val).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.recordInfo.recordData[this.recordInfo.current_index].good_type_id = response.data.data.info.good_type_id
-              this.recordInfo.recordData[this.recordInfo.current_index].good_id = response.data.data.info.good_id
-              this.recordInfo.recordData[this.recordInfo.current_index].number = response.data.data.info.number
-              this.recordInfo.recordData[this.recordInfo.current_index].product_date = response.data.data.info.product_date
-              this.recordInfo.recordData[this.recordInfo.current_index].expiry_date = response.data.data.info.expiry_date
-              this.recordInfo.recordData[this.recordInfo.current_index].warehousing_count = response.data.data.info.warehousing_count
-              this.recordInfo.recordData[this.recordInfo.current_index].price = response.data.data.info.price
-              this.recordInfo.recordData[this.recordInfo.current_index].remark = response.data.data.info.remark
-              this.$notify({
-                title: "成功",
-                message: "修改成功",
-                type: "success",
-                duration: 2000
-              });
-            }
-          });
-
-
-        } else if (val.isCreated == 1) { //添加
-
-
-          if (sessionStorage.getItem("warehousing_orders") == null) {
-
-            this.warehousing_order = ''
-          } else {
-            this.warehousing_order = sessionStorage.getItem("warehousing_orders")
-          }
-          console.log(this.warehousing_order)
-          let tempArr = []
-          tempArr.push(val)
-          let params = {
-            'stockIn': tempArr
-          }
-          postWarehouse(params, this.warehousing_time, this.warehousing_order).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.push(response.data.data.info)
-
-
-              if (sessionStorage.getItem("warehousing_orders") == null) {
-                sessionStorage.setItem("warehousing_orders", response.data.data.warehousing_order)
-              }
-
-
-            }
-          });
-
-
-        }
-      }, cancle: function () {
-        this.isVisibility = false
-
-      }, GetAllGoodType: function () {
-        GetAllGoodType().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodType.length; i++) {
-              this.propForm.goodType.push(response.data.data.goodType[i])
-            }
-          }
-        });
-
-
-      }, GetAllGoodInfo: function () {
-        GetAllGoodInfo().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-              this.propForm.goodInfo.push(response.data.data.goodInfo[i])
-
-            }
-          }
-        });
-
-
-      }, 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) {
-        this.recordInfo.current_index = index
-        for (let key in this.propForm.formValue) {
-          this.propForm.formValue[key] = row[key]
-
-        }
-
-        this.propForm.formValue.expiry_date = uParseTime(row['expiry_date'], "{y}-{m}-{d}")
-        this.propForm.formValue.product_date = uParseTime(row['product_date'], "{y}-{m}-{d}")
-
-
-        this.propForm.isCreated = 2
-        this.isVisibility = true
-
-      }, handleDelete: function (index, row) {
-        let params = {
-          "id": row.id
-
-
-        }
-
-        this.$confirm('确认删除这条信息?', '删除物品信息', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          deleteWarehouseInfo(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000
-              });
-              this.recordInfo.recordData.splice(index, 1)
-            }
-          });
-
-        }).catch(() => {
-        });
-
-      }, showDetails: function (index, row) {
-        for (let key in this.propForm.formValue) {
-          this.propForm.formValue[key] = row[key]
-        }
-        this.propForm.formValue.expiry_date = uParseTime(row['expiry_date'], "{y}-{m}-{d}")
-        this.propForm.formValue.product_date = uParseTime(row['product_date'], "{y}-{m}-{d}")
-
-        this.propForm.isCreated = 3
-        this.isVisibility = true
-
-      }, calculate: function (val) {
-        return Math.round(parseFloat(val) * 100) / 100
-      }, GetWarehouseInfoByOrdeNumber: function () {
-        let params = {
-          "warehousing_order": sessionStorage.getItem("warehousing_orders")
-        }
-        this.recordInfo.recordData = []
-        getWarehouseInfoByOrdeNumber(params).then(response => {
-          if (response.data.state != 0) {
-            for (let i = 0; i < response.data.data.info.length; i++) {
-              this.recordInfo.recordData.push(response.data.data.info[i])
-            }
-          }
-        });
-
-      },getTime(val,temp){
-        if(val != 0){
-          return uParseTime(val, temp);
-        }else{
-          return "";
-        }
-
-
-      }
-    },
-    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.warehousing_time = endTime
-
-      this.GetAllGoodType()
-      this.GetAllGoodInfo()
-      this.GetWarehouseInfoByOrdeNumber()
-
-    },
-
-  };
-</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;
-    }
-  }
-
-  .titleTop {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-        font-size: 14px;
-  }
-  .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/addStockOut.vue

@@ -1,423 +0,0 @@
-<template>
-<div class="main-contain">
-  <div class="position">
-    <bread-crumb></bread-crumb>
-     <el-row style="float:right;">
-        <!--<el-button @click="handleSave" type="primary">保存</el-button>-->
-        <el-button size="small"  icon="el-icon-refresh" @click="handleCancle" >返回</el-button>
-        <el-button size="small"  icon="el-icon-circle-plus-outline" @click="handleCreate" type="primary">添加</el-button>
-      </el-row>
-  </div>
-  <div class="app-container sign-and-weigh-box">
-    <stock-out-dialog  :propForm="propForm"
-                      :visibility="isVisibility"
-                      v-on:dialog-comfirm="comfirm"
-                      v-on:dialog-cancle="cancle"></stock-out-dialog>
-
-    <div class="cell">
-      <label for="" class="title"> <span class="name">出库时间:</span></label>
-      <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-row >
-      <el-col >
-        <div class="titleTop">出库列表
-        </div>
-        <div style="margin-bottom: 10px;">
-        </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-        >
-          <el-table-column label="物品类型" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{typeName(scope.row.good_type_id)}}
-            </template>
-          </el-table-column>
-          <el-table-column label="规格名称" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{specificationName(scope.row.good_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">
-              {{calculate(scope.row.price*scope.row.count)}}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" min-width="70">
-            <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="添加" placement="top">
-                <el-button
-                  size="small"
-                  icon="el-icon-circle-plus-outline"
-                  @click="handleEdit(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                <el-button
-                  size="small"
-                  icon="el-icon-delete"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
-                <el-button
-                  size="small"
-                  icon="el-icon-document"
-                  type="primary"
-                  @click="showDetails(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-
-    </el-row>
-  </div>
-   </div>
-</template>
-
-<script>
-  import stockOutDialog from './Dialog/stockOutDialog'
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-  import {
-    GetAllGoodInfo,
-    GetAllGoodType,
-    postWarehouseOut,
-    getWarehouseOutInfoByOrdeNumber,
-    modifyWarehouseOutInfo,
-    deleteWarehouseOutInfo
-  } from "@/api/stock";
-
-  export default {
-    components: {stockOutDialog,BreadCrumb},
-    name: "stockOut",
-    data() {
-      return {
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        warehousing_time: '',
-        adminUserOptions:null,
-        warehousing_out_order:'',
-        recordInfo: {
-          recordData: [],
-          stock_in_code: '',
-          current_index:'',
-
-        },
-        total:'',
-
-        //prop
-        isVisibility:false,
-        propForm:{
-          goodType:[],
-          goodInfo:[],
-          title:'出库',
-          formValue:{
-            good_type_id:'',
-            good_id:'',
-            product_date:'',
-            expiry_date:'',
-            count:'',
-            price:'',
-            remark:'',
-          },
-          isCreated:1,
-
-        },
-
-        goodInfo: {
-          loading: false,
-          goodTypeData: [],
-          type_code: '',
-        }
-
-
-
-      };
-    },
-    methods: {
-      handleSave:function () {
-
-
-      },handleCancle:function () {
-        this.$confirm('是否放弃编辑返回上一页?', '放弃编辑', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.recordInfo.recordData = []
-          sessionStorage.removeItem("warehousing_out_orders")
-
-
-          this.$router.back(-1)
-        }).catch(() => {
-
-        });
-
-      },handleCreate:function () {
-        this.propForm.formValue = {}
-        this.propForm.isCreated = 1
-        this.isVisibility = true
-
-
-      },comfirm:function (val) {
-        console.log(val)
-        this.isVisibility = false
-        if (val.isCreated == 2) { //修改
-
-          val['warehousing_out_orders'] = sessionStorage.getItem("warehousing_out_orders")
-          modifyWarehouseOutInfo(val).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.recordInfo.recordData[this.recordInfo.current_index].good_type_id = response.data.data.info.good_type_id
-              this.recordInfo.recordData[this.recordInfo.current_index].good_id = response.data.data.info.good_id
-              this.recordInfo.recordData[this.recordInfo.current_index].count = response.data.data.info.count
-              this.recordInfo.recordData[this.recordInfo.current_index].price = response.data.data.info.price
-              this.recordInfo.recordData[this.recordInfo.current_index].remark = response.data.data.info.remark
-
-              this.$notify({
-                title: "成功",
-                message: "修改成功",
-                type: "success",
-                duration: 2000
-              });
-            }
-          });
-
-
-
-        } else if (val.isCreated == 1) { //添加
-
-          console.log(sessionStorage.getItem("warehousing_out_orders"))
-
-          if ( sessionStorage.getItem("warehousing_out_orders") === "undefined" || sessionStorage.getItem("warehousing_out_orders") == null) {
-
-            this.warehousing_out_order = ''
-
-          } else {
-
-            this.warehousing_out_order = sessionStorage.getItem("warehousing_out_orders")
-          }
-
-          let tempArr = []
-          tempArr.push(val)
-          let params = {
-            'stockOut': tempArr
-          }
-          postWarehouseOut(params, this.warehousing_time, this.warehousing_out_order).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.push(response.data.data.info)
-
-              if ( sessionStorage.getItem("warehousing_out_orders") === "undefined" || sessionStorage.getItem("warehousing_out_orders") == null) {
-                sessionStorage.setItem("warehousing_out_orders", response.data.data.warehousing_out_order)
-              }
-
-
-            }
-          });
-
-
-          // this.recordInfo.recordData.push(val)
-        }
-      },cancle:function () {
-        this.isVisibility = false
-
-      },GetAllGoodType:function () {
-        GetAllGoodType().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodType.length; i++) {
-              this.propForm.goodType.push(response.data.data.goodType[i])
-            }
-          }
-        });
-
-
-      },GetAllGoodInfo:function () {
-        GetAllGoodInfo().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-              this.propForm.goodInfo.push(response.data.data.goodInfo[i])
-
-            }
-          }
-        });
-
-
-      },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) {
-        this.recordInfo.current_index = index
-        for(let key in this.propForm.formValue){
-          this.propForm.formValue[key] = row[key]
-        }
-        this.propForm.isCreated = 2
-        this.isVisibility = true
-
-      },handleDelete:function (index, row) {
-        console.log(row)
-        let 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(() => {
-        });
-
-      },showDetails:function (index, row) {
-        for(let key in this.propForm.formValue){
-          this.propForm.formValue[key] = row[key]
-        }
-        this.propForm.isCreated = 3
-        this.isVisibility = true
-
-      },calculate:function (val) {
-        return Math.round(parseFloat(val)*100)/100
-      }, GetWarehouseOutInfoByOrdeNumber: function () {
-        let params = {
-          "warehousing_out_order": sessionStorage.getItem("warehousing_out_orders")
-        }
-        this.recordInfo.recordData = []
-        getWarehouseOutInfoByOrdeNumber(params).then(response => {
-          if (response.data.state != 0) {
-            for (let i = 0; i < response.data.data.info.length; i++) {
-              this.recordInfo.recordData.push(response.data.data.info[i])
-            }
-          }
-        });
-
-      }
-    },
-
-
-    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.warehousing_time = endTime
-      this.GetAllGoodType()
-      this.GetAllGoodInfo()
-      this.GetWarehouseOutInfoByOrdeNumber()
-
-    }
-  };
-</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;
-    }
-  }
-
-  .titleTop {
-    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;
-        font-size: 14px;
-  }
-
-  .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/cancelStock.vue

@@ -1,300 +0,0 @@
-<template>
-
-  <div class="app-container sign-and-weigh-box">
-
-    <div class="filter-container">
-      <span>出库退库时间:</span>
-      <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd"></el-date-picker>
-
-      <el-row style="float:right;">
-        <el-button @click="handleSave" type="primary">确定</el-button>
-      </el-row>
-    </div>
-
-
-    <el-row>
-      <el-col>
-        <div class="title">出库退库列表</div>
-        <div style="margin-bottom: 10px;"></div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="cancelStockTableData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  @row-click="onRowClick"
-                  :row-class-name="tableRowClassName"
-        >
-          <el-table-column label="出库单号" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.warehouse_out_order_number}}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="规格名称" align="center" min-width="30">
-            <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.warehouse_out_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">
-              <el-input type="number" v-model="scope.row.return_count" @blur="handleBlur(scope.$index, scope.row)"></el-input>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="操作" align="center" min-width="30">
-            <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                <el-button
-                  size="small"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-
-    </el-row>
-
-  </div>
-</template>
-
-<script>
-  import {uParseTime} from "@/utils/tools";
-
-  import {
-    GetAllGoodInfo,
-    GetAllGoodType,
-    postCancelStock,
-    getWarehouseOutInfo
-
-  } from "@/api/stock";
-
-  export default {
-    name: "cancelStock",
-    data() {
-      return {
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        return_time: '',
-        adminUserOptions: null,
-        cancelStockTableData: [],
-        total: '',
-        isVisibility: false,
-        goodInfo: [],
-        goodType: [],
-        isClick: false,
-        orderNumber:'',
-      };
-    },
-    methods: {
-      GetWarehouse:function () {
-        let params ={
-          ids:this.$route.query.id
-        }
-        getWarehouseOutInfo(params).then(response =>{
-          if(response.data.state == 0){
-            this.$message.error(response.data.msg)
-            return false
-          }else{
-            this.cancelStockTableData = []
-            for (let i = 0; i < response.data.data.info.length; i++) {
-              let salesReturnInfo = {}
-              this.orderNumber = response.data.data.info[i].WarehouseOut.warehouse_out_order_number
-              salesReturnInfo['id'] = response.data.data.info[i].id
-              salesReturnInfo['warehouse_out_order_number'] = response.data.data.info[i].WarehouseOut.warehouse_out_order_number
-              salesReturnInfo['good_id'] = response.data.data.info[i].good_id
-              salesReturnInfo['good_type_id'] = response.data.data.info[i].good_type_id
-              salesReturnInfo['warehouse_out_count'] = response.data.data.info[i].count
-              salesReturnInfo['price'] = response.data.data.info[i].price
-              salesReturnInfo['return_count'] = ''
-              salesReturnInfo['return_total'] = ''
-              this.cancelStockTableData.push(salesReturnInfo)
-            }
-
-          }
-        })
-      },
-      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])
-            }
-          }
-        });
-
-      }, 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
-      }, handleDelete: function (index, row) {
-        this.$confirm('确认删除这条退货信息?', '删除退货信息', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.cancelStockTableData.splice(index, 1)
-        }).catch(() => {
-        });
-
-      }, handleBlur: function (index, row) {
-        if (this.cancelStockTableData[index].return_count == '') {
-          this.$message.error('退货数量不能为空');
-          return
-        }
-        // if (this.salesReturnTableData[index].return_count > this.salesReturnTableData[index].warehousing_count) {
-        //   this.salesReturnTableData[index].return_count = ''
-        //   this.$message.error('退货数量不能大于入库数量');
-        //   return
-        // }
-      }, handleSave: function () {
-        let total = 0
-        let ids = []
-        for (let i = 0; i < this.cancelStockTableData.length; i++) {
-          // if (this.salesReturnTableData[i].return_count > this.salesReturnTableData[i].warehousing_count) {
-          //   this.$message.error('退货数量不能大于入库数量');
-          //   return
-          // }
-          if (this.cancelStockTableData[i].return_count == '') {
-            this.$message.error('退货数量不能为空');
-            return
-          }
-          ids.push(this.cancelStockTableData[i].id)
-          total = total + parseInt(this.cancelStockTableData[i].return_count)
-        }
-
-        let params = {
-          'cancelStock':this.cancelStockTableData
-        }
-        postCancelStock(params,this.return_time,total,ids.join("-"),this.orderNumber).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)
-          }
-        });
-
-      }
-
-    },
-    mounted() {
-      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.return_time = endTime
-
-      this.GetAllGoodType()
-      this.GetAllGoodInfo()
-      this.GetWarehouse()
-
-    },
-
-
-  };
-</script>
-
-<style rel="stylesheet/css" lang="scss" scoped>
-  .information {
-    border: 1px #dcdfe6 solid;
-    padding: 30px 20px 30px 20px;
-
-    .border {
-      border-bottom: 1px #dcdfe6 solid;
-      margin: 0px 0 20px 0;
-    }
-  }
-
-  .title {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-    // border-radius: 4px 4px 0 0;
-  }
-
-  .edit_separater {
-    border-top: 1px solid rgb(233, 233, 233);
-    margin-top: 15px;
-    margin-bottom: 15px;
-  }
-
-</style>
-
-<style>
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-    font-size: 12px;
-  }
-
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-    background: #6fb5fa;
-  }
-
-</style>

src/xt_pages/stock/cancelStockOrder.vue

@@ -17,7 +17,7 @@
       </div>
 
       <div class="cell">
-        <span>出库退库时间:&nbsp;&nbsp;</span>
+        <label class="title"><span class="name">退库时间</span> : </label>
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
@@ -81,21 +81,24 @@
           </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 slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-edit"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
 
             </template>
           </el-table-column>
@@ -378,15 +381,6 @@
 
   }
 
-  .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);

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -2,6 +2,10 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div style="float:right;">
+        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+      </div>
     </div>
 
   <div class="app-container">
@@ -13,61 +17,46 @@
 
     <div class="filter-container">
 
-      <el-row>
-        <el-col :span="8"><div>
-          <span>退库时间:</span>
+
+        <div class="cell">
+          <label class="title"><span class="name">退库时间</span> : </label>
+
           <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                           type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                           value-format="yyyy-MM-dd"></el-date-picker>
-        </div></el-col>
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
-              <el-form-item label="厂商：" prop="manufacturer">
-                <el-select v-model="form.manufacturer" placeholder="请选择厂商">
-                  <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div>
-            <el-form ref="form" :model="form" label-width="80px">
-              <el-form-item label="经销商：">
-                <el-select v-model="form.dealer" placeholder="请选择经销商">
-                  <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name" :value="option.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-col>
-      </el-row>
+        </div>
+        <div class="cell clearfix">
+          <label class="title"><span class="name">厂商</span> : </label>
+          <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" >
+            <el-option
+              v-for="(option, index) in manufacturer"
+              :key="index"
+              :label="option.manufacturer_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
+        </div>
+
+        <div class="cell clearfix">
+          <label class="title"><span class="name">经销商</span> : </label>
+          <el-select  v-model="form.dealer" clearable  placeholder="请选择经销商" >
+            <el-option
+              v-for="(option, index) in dealer"
+              :key="index"
+              :label="option.dealer_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
+        </div>
+
 
     </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"
-          >
+                    max-height="450"         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
 
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-button
-                  size="small"
-                  icon="el-icon-edit-outline"
-                  @click="handleEdit(scope.$index, scope.row)">+
-                </el-button>
-                <el-button
-                  size="small"
-                  icon="el-icon-delete"
-                  type="danger"
-                  @click="handleDelete(scope.$index, scope.row)">-
-                </el-button>
-              </template>
-            </el-table-column>
+          >
 
             <el-table-column min-width="35" align="center">
 
@@ -102,20 +91,36 @@
               </template>
               <template slot-scope="scope">
                 <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count' style="padding-top: 17px">
-                  <el-input type="number"  v-model="scope.row.return_count" ></el-input>
+                  <el-input placeholder="请输入退库数量" type="number"  v-model="scope.row.return_count" ></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
+            <el-table-column label="操作" align="center" min-width="20">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="新增" placement="top">
+
+                  <el-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-circle-plus-outline"
+                    @click="handleEdit(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                  <el-button
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-remove-outline"
+                    @click="handleDelete(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+
+              </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>
   </div>
 </template>
@@ -376,16 +381,6 @@
   }
   }
 
-  .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;

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -27,6 +27,7 @@
 
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table :data="CancelStockInfo.cancelStockInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       >
         <el-table-column min-width="35" align="center">
           <template slot="header" slot-scope="scope">
@@ -210,14 +211,6 @@
 
   }
 
-  .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);

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -2,6 +2,10 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div style="float:right;">
+        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+      </div>
     </div>
     <div class="app-container">
       <sales-return-dialog :propForm="propForm"
@@ -9,94 +13,90 @@
                            v-on:dialog-comfirm="comfirm"
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
 
-      <div class="filter-container">
-
-        <el-row>
-          <el-col :span="8">
-            <div>
-              <span>退库时间:</span>
-              <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                              type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd"></el-date-picker>
-            </div>
-          </el-col>
-        </el-row>
+      <div class="cell">
+
+        <label class="title"><span class="name">退库时间</span> : </label>
+        <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"></el-date-picker>
       </div>
 
-      <el-row>
-        <el-col>
-          <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-            <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                      max-height="450"
-            >
-
-              <el-table-column label="操作" align="center" min-width="30">
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    @click="handleEdit(scope.$index, scope.row)">+
-                  </el-button>
-                  <el-button
-                    size="mini"
-                    type="danger"
-                    @click="handleDelete(scope.$index, scope.row)">-
-                  </el-button>
-                </template>
-              </el-table-column>
-
-              <el-table-column min-width="35" align="center">
-
-                <template slot="header" slot-scope="scope">
-                  <span>物品类型<span style="color: red">*</span></span>
-                </template>
-
-                <template slot-scope="scope">
-                  <el-form-item style="padding-top: 15px">
-                    <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
-                              :value="typeName(scope.row.good_type_id)"
-                              @focus="showDialog(scope.$index, scope.row)"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column min-width="35" align="center">
-                <template slot="header" slot-scope="scope">
-                  <span>规格名称<span style="color: red">*</span></span>
-                </template>
-                <template slot-scope="scope">
-
-                  <el-form-item style="padding-top: 15px">
-                    <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
-                              :value="specificationName(scope.row.good_id)"
-                              @focus="showDialog(scope.$index, scope.row)"></el-input>
-                  </el-form-item>
-
-                </template>
-              </el-table-column>
-
-
-              <el-table-column min-width="23" align="center">
-                <template slot="header" slot-scope="scope">
-                  <span>退货数量<span style="color: red">*</span></span>
-                </template>
-                <template slot-scope="scope">
-                  <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
-                                style="padding-top: 17px">
-                    <el-input type="number" v-model="scope.row.count"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-
-
-            </el-table>
-          </el-form>
-        </el-col>
-
-
-        <span class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-      </el-row>
+      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+
+
+          <el-table-column min-width="35" align="center">
+
+            <template slot="header" slot-scope="scope">
+              <span>物品类型<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                          :value="typeName(scope.row.good_type_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                          :value="specificationName(scope.row.good_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退货数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                            style="padding-top: 17px">
+                <el-input type="number" v-model="scope.row.count"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" min-width="20">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="新增" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-remove-outline"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+
+            </template>
+          </el-table-column>
+
+
+        </el-table>
+      </el-form>
+
     </div>
   </div>
 
@@ -366,15 +366,7 @@
 
   }
 
-  .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);

src/xt_pages/stock/cancelStockRecord.vue

@@ -1,388 +0,0 @@
-<template>
-<div class="main-contain">
-  <div class="position">
-    <bread-crumb></bread-crumb>
-    <el-row style="float:right;">
-        <el-button size="small" icon="el-icon-refresh" @click="handleBack">返回</el-button>
-      </el-row>
-  </div>
-  <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>
-    </div>
-
-
-    <el-row :gutter="12">
-      <el-col :span="8">
-        <div class="title">出库退库记录
-        </div>
-        <div style="margin-bottom: 10px;">
-        </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :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-col>
-
-      <el-col :span="16">
-        <div class="titleTop">物品详细信息
-        </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :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>
-    <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
-          background
-          align="right"
-          style="margin-top:20px;"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
-        </el-pagination>
-  </div>
-</div>
-
-</template>
-
-<script>
-  import {uParseTime} from "@/utils/tools";
-  import { fetchAllDoctorAndNurse,fetchAllAdminUsers } from "@/api/doctor";
-  import {
-    getCancelStockList,
-    getCancelStockInfoList,
-    GetAllGoodInfo,
-    GetAllGoodType,
-  } from "@/api/stock";
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-  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()
-
-    },
-    components:{
-      BreadCrumb
-    },
-    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

@@ -16,7 +16,8 @@
       </div>
 
       <div class="cell">
-        <span>其他出库退库时间:&nbsp;&nbsp;</span>
+        <label class="title"><span class="name">退库时间</span> : </label>
+
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
@@ -78,22 +79,25 @@
               {{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>
+              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-edit"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
 
             </template>
           </el-table-column>
@@ -273,7 +277,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id }})
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)
@@ -376,15 +380,6 @@
 
   }
 
-  .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);

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -15,8 +15,9 @@
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
-      <div class="filter-container">
-        <span>其他退货时间:&nbsp;&nbsp;</span>
+      <div class="cell">
+        <label class="title"><span class="name">退货时间</span> : </label>
+
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
@@ -81,12 +82,16 @@
 
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+
               <el-button
                 size="mini"
                 type="primary"
                 icon="el-icon-edit"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
 
               <el-button
                 size="mini"
@@ -94,6 +99,8 @@
                 icon="el-icon-delete"
                 @click="handleDelete(scope.$index, scope.row)">
               </el-button>
+              </el-tooltip>
+
 
             </template>
           </el-table-column>
@@ -383,15 +390,7 @@
 
   }
 
-  .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);

src/xt_pages/stock/otherStockInOrder.vue

@@ -10,12 +10,13 @@
     <div class="app-container">
 
       <div class="cell">
-        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell">
-        <span>其他入库时间:&nbsp;&nbsp;</span>
+        <label class="title"><span class="name">入库时间</span> : </label>
+
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
@@ -81,7 +82,7 @@
 
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-tooltip class="item" effect="dark" content="编辑" placement="top">  
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
               <el-button
                 size="small"
                 type="primary"
@@ -376,7 +377,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'stockInDetail', query: { id: row.id }})
+        this.$router.push({ name: 'stockInDetail', query: { id: row.id ,type:this.type}})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)
@@ -479,15 +480,7 @@
 
   }
 
-  .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);

src/xt_pages/stock/otherStockOutOrder.vue

@@ -3,7 +3,9 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button size="small"  @click="AddNewOrder" class="filter-item" style="float:right;" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
+      <el-button size="small" @click="AddNewOrder" class="filter-item" style="float:right;" type="primary"
+                 icon="el-icon-circle-plus-outline">新增
+      </el-button>
     </div>
     <div class="app-container">
       <div class="cell">
@@ -13,7 +15,8 @@
 
 
       <div class="cell">
-        <span>其他出库时间:&nbsp;&nbsp;</span>
+        <label class="title"><span class="name">出库时间</span> : </label>
+
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
@@ -73,20 +76,27 @@
         </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>
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit"
+                @click="handleEdit(scope.$index, scope.row)">
+              </el-button>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)">
+              </el-button>
+            </el-tooltip>
+
           </template>
         </el-table-column>
       </el-table>
@@ -106,20 +116,13 @@
   </div>
 
 
-
-
-
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
 
-  import {
-    deleteWarehouseOut,
-    GetAllConfig,
-    getWarehouseOutList
-  } from '@/api/stock'
+  import { deleteWarehouseOut, GetAllConfig, getWarehouseOutList } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
 
   export default {
@@ -182,7 +185,7 @@
     },
     methods: {
       AddNewOrder: function() {
-        this.$router.push({ name: 'stockOutOrderAdd', query: { type: this.type }})
+        this.$router.push({ name: 'stockOutOrderAdd', query: { type: this.type } })
       },
       GetWarehouseOut: function() {
         const Params = {
@@ -273,7 +276,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'stockOutDetail', query: { id: row.id, type: this.type }})
+        this.$router.push({ name: 'stockOutDetail', query: { id: row.id, type: this.type } })
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)
@@ -366,13 +369,16 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container {
-  // margin: 20px;
+
     font-size: 15px;
+
   .filter-container {
     padding-bottom: 5px;
   }
+
   .search-component {
     width: 500px;
+
   .searchBox {
     width: 300px;
     height: 36px;
@@ -388,6 +394,7 @@
     background: #fff;
     box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
   }
+
   .searchBtn {
     background-color: #409eff;
     color: #fff;
@@ -403,6 +410,7 @@
     font-family: "Microsoft Yahei";
     cursor: pointer;
   }
+
   }
   .cell {
     margin: 0px 0 15px 0;
@@ -413,37 +421,23 @@
     box-sizing: border-box;
     display: -webkit-box;
     display: -ms-flexbox;
-  // display: flex;
     -webkit-box-align: flex-start;
     -ms-flex-align: flex-start;
     align-items: flex-start;
     text-align: left;
     justify-content: flex-start;
     color: #333;
-  .title {
-    width: 80px;
-    display: inline-block;
-    font-weight: normal;
-    color: #909399;
-    padding: 6px 0;
-    font-weight: 700;
-  .name {
-    width: 60px;
-    text-align: justify;
-    text-justify: distribute-all-lines;
-    text-align-last: justify;
-    -moz-text-align-last: justify;
-    -webkit-text-align-last: justify;
-    display: inline-block;
-  }
-  }
+
+
   .time {
     -webkit-box-flex: 1;
     -ms-flex: 1;
     flex: 1;
+
   ul {
     padding: 0;
     margin: 0;
+
   li {
     float: left;
     list-style: none;
@@ -455,16 +449,20 @@
     margin: 0 10px 0 0;
     color: #409eff;
     border: 1px #409eff solid;
-    text-align:center;
-  &:hover {
-     background: #409eff;
-     color: #fff;
-   }
+    text-align: center;
+
+  &
+  :hover {
+    background: #409eff;
+    color: #fff;
+  }
+
   }
   .active {
     background: #409eff;
     color: #fff;
   }
+
   }
   }
   }
@@ -473,11 +471,13 @@
     padding: 10px 0 0 0;
     color: #606266;
     font-size: 14px;
+
   span {
     color: #ef2525;
     font-family: "Arial";
     padding: 0 2px;
   }
+
   }
   }
 </style>

src/xt_pages/stock/salesReturn.vue

@@ -1,315 +0,0 @@
-<template>
-<div class="main-contain">
-  <div class="position">
-    <bread-crumb></bread-crumb>
-    <el-row style="float:right;">
-        <el-button size="small" icon="el-icon-circle-check" @click="handleSave" type="primary">保 存</el-button>
-    </el-row>
-  </div>
-  <div class="app-container sign-and-weigh-box">
-    <div class="cell">
-     <label class="title"><span class="name">入库退货时间:</span></label>
-      <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd"></el-date-picker>
-
-      
-    </div>
-
-
-    <el-row>
-      <el-col>
-        <div class="titleTop">入库退货列表</div>
-        <div style="margin-bottom: 10px;"></div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="salesReturnTableData" :class="signAndWeighBoxPatients" style="width: 100%" border
-        >
-          <el-table-column label="入库单号" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.warehousing_order}}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="规格名称" align="center" min-width="30">
-            <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.warehousing_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">
-              <el-input type="number" v-model="scope.row.return_count" @blur="handleBlur(scope.$index, scope.row)"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" min-width="30">
-            <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                  <el-button
-                    size="small"
-                    type="danger"
-                    icon="el-icon-delete"
-                    @click="handleDelete(scope.$index, scope.row)">
-                  </el-button>
-              </el-tooltip>
-
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-
-    </el-row>
-  </div>
-   
-  </div>
-</template>
-
-<script>
-  import {uParseTime} from "@/utils/tools";
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-  import {
-    GetAllGoodInfo,
-    GetAllGoodType,
-    postSalesReturn,
-    getWarehouseInfo
-  } from "@/api/stock";
-
-  export default {
-    name: "stockIn",
-    components:{
-      BreadCrumb
-    },
-    data() {
-      return {
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        return_time: '',
-        adminUserOptions: null,
-        salesReturnTableData: [],
-        total: '',
-        isVisibility: false,
-        goodInfo: [],
-        goodType: [],
-        isClick: false,
-        OrderNumber:'',
-      };
-    },
-    methods: {
-      GetWarehouse:function () {
-        let params ={
-          ids:this.$route.query.id
-        }
-        getWarehouseInfo(params).then(response =>{
-          if(response.data.state == 0){
-              this.$message.error(response.data.msg)
-              return false
-          }else{
-            this.salesReturnTableData = []
-            for (let i = 0; i < response.data.data.info.length; i++) {
-              let salesReturnInfo = {}
-              this.OrderNumber = response.data.data.info[i].Warehousing.warehousing_order
-              salesReturnInfo['id'] = response.data.data.info[i].id
-              salesReturnInfo['warehousing_order'] = response.data.data.info[i].Warehousing.warehousing_order
-              salesReturnInfo['good_id'] = response.data.data.info[i].good_id
-              salesReturnInfo['good_type_id'] = response.data.data.info[i].good_type_id
-              salesReturnInfo['warehousing_count'] = response.data.data.info[i].warehousing_count
-              salesReturnInfo['price'] = response.data.data.info[i].price
-              salesReturnInfo['return_count'] = ''
-              salesReturnInfo['return_total'] = ''
-              this.salesReturnTableData.push(salesReturnInfo)
-            }
-
-          }
-        })
-      },
-      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])
-            }
-          }
-        });
-
-      }, 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
-      }, handleDelete: function (index, row) {
-        this.$confirm('确认删除这条退货信息?', '删除退货信息', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.salesReturnTableData.splice(index, 1)
-        }).catch(() => {
-        });
-
-      }, handleBlur: function (index, row) {
-        if (this.salesReturnTableData[index].return_count == '') {
-          this.$message.error('退货数量不能为空');
-          return
-        }
-        // if (this.salesReturnTableData[index].return_count > this.salesReturnTableData[index].warehousing_count) {
-        //   this.salesReturnTableData[index].return_count = ''
-        //   this.$message.error('退货数量不能大于入库数量');
-        //   return
-        // }
-      }, handleSave: function () {
-
-        let total = 0
-        let ids = []
-        if(this.salesReturnTableData.length <= 0){
-          this.$message.error('请新增退货的物品');
-          return
-        }
-
-        for (let i = 0; i < this.salesReturnTableData.length; i++) {
-          // if (this.salesReturnTableData[i].return_count > this.salesReturnTableData[i].warehousing_count) {
-          //   this.$message.error('退货数量不能大于入库数量');
-          //   return
-          // }
-          if (this.salesReturnTableData[i].return_count == '') {
-            this.$message.error('退货数量不能为空');
-            return
-          }
-          ids.push(this.salesReturnTableData[i].id)
-          total = total + parseInt(this.salesReturnTableData[i].return_count)
-        }
-
-
-
-
-        let params = {
-          'salesReturn':this.salesReturnTableData
-        }
-        postSalesReturn(params,this.return_time,total,ids.join("-"),this.OrderNumber).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)
-          }
-        });
-
-      }
-
-    },
-    mounted() {
-      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.return_time = endTime
-
-      this.GetAllGoodType()
-      this.GetAllGoodInfo()
-      this.GetWarehouse()
-
-
-    },
-
-
-  };
-</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;
-    }
-  }
-
-  .titleTop {
-    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;
-        font-size: 14px;
-  }
-
-  .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/salesReturnEdit.vue

@@ -2,6 +2,10 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div style="float:right;">
+        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+      </div>
     </div>
 
   <div class="app-container">
@@ -11,47 +15,19 @@
                      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>
+    <div class="cell">
+            <label class="title"><span class="name">退货时间</span> : </label>
             <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                             type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                             value-format="yyyy-MM-dd"></el-date-picker>
-          </div>
-        </el-col>
-      </el-row>
     </div>
 
-    <el-row>
-      <el-col>
         <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
           <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                    max-height="450"
+                    max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           >
 
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                 <el-tooltip class="item" effect="dark" content="编辑" placement="top">  
-                  <el-button
-                    size="small"
-                    type="primary"
-                    icon="el-icon-edit"
-                    @click="handleEdit(scope.$index, scope.row)">
-                  </el-button>
-                  </el-tooltip>
-                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                    <el-button
-                      size="small"
-                      type="danger"
-                      icon="el-icon-delete"
-                      @click="handleDelete(scope.$index, scope.row)">
-                    </el-button>
-                </el-tooltip>
-              </template>
-            </el-table-column>
+
 
             <el-table-column min-width="35" align="center">
 
@@ -90,23 +66,38 @@
               <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-input  placeholder="请输入退货数量" type="number" v-model="scope.row.count"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
 
+            <el-table-column label="操作" align="center" min-width="20">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
-          </el-table>
-        </el-form>
-      </el-col>
+                  <el-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-circle-plus-outline"
+                    @click="handleEdit(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                  <el-button
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-remove-outline"
+                    @click="handleDelete(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
 
+              </template>
+            </el-table-column>
 
-      <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>
+          </el-table>
+        </el-form>
   </div>
   </div>
 
@@ -382,15 +373,7 @@
 
   }
 
-  .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);

src/xt_pages/stock/salesReturnOrder.vue

@@ -15,7 +15,7 @@
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
-      <div class="filter-container">
+      <div class="cell">
         <label class="title"><span class="name">退货时间</span> : </label>
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
@@ -26,13 +26,12 @@
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
       </div>
 
-      <div class="filter-container" style="margin-top: 10px">
+      <div class="cell clearfix" style="margin-top: 10px">
         <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
 
       </div>
 
-      <el-row :gutter="12" style="margin-top: 10px">
         <el-table
           :data="saleReturnDate"
           :class="signAndWeighBoxPatients"
@@ -80,20 +79,24 @@
           </el-table-column>
 
           <el-table-column label="操作" align="center">
+
             <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
               <el-button
                 size="mini"
                 type="primary"
                 icon="el-icon-edit"
                 @click="handleEdit(scope.$index, scope.row)">
               </el-button>
-
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
               <el-button
                 size="mini"
                 type="danger"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.$index, scope.row)">
               </el-button>
+              </el-tooltip>
 
             </template>
           </el-table-column>
@@ -111,7 +114,6 @@
           :total="total">
         </el-pagination>
 
-      </el-row>
     </div>
   </div>
 
@@ -383,15 +385,7 @@
 
   }
 
-  .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);

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -2,6 +2,10 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div style="float:right;">
+        <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item">确 定</el-button>
+      </div>
     </div>
 
     <div class="app-container">
@@ -9,127 +13,122 @@
                            :visibility="isVisibility"
                            v-on:dialog-comfirm="comfirm"
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
-      <div class="filter-container">
-        <el-row>
-          <el-col :span="8">
-            <div>
-              <span>退货时间:</span>
-              <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                              type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd"></el-date-picker>
-            </div>
-          </el-col>
-
-
-          <el-col :span="8">
-            <div>
-              <el-form ref="form" :model="form" :rules="ruleForm" label-width="80px">
-                <el-form-item label="厂商：" prop="manufacturer">
-                  <el-select v-model="form.manufacturer" placeholder="请选择厂商">
-                    <el-option v-for="(option, index) in manufacturer" :key="index" :label="option.manufacturer_name"
-                               :value="option.id"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-form>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div>
-              <el-form ref="form" :model="form" label-width="80px">
-                <el-form-item label="经销商：">
-                  <el-select v-model="form.dealer" placeholder="请选择经销商">
-                    <el-option v-for="(option, index) in dealer" :key="index" :label="option.dealer_name"
-                               :value="option.id"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-form>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col>
-            <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
-              <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                        max-height="450"
-              >
-
-                <el-table-column label="操作" align="center" min-width="30">
-                  <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      @click="handleEdit(scope.$index, scope.row)">+
-                    </el-button>
-                    <el-button
-                      size="mini"
-                      type="danger"
-                      @click="handleDelete(scope.$index, scope.row)">-
-                    </el-button>
-                  </template>
-                </el-table-column>
-
-                <el-table-column min-width="35" align="center">
-
-                  <template slot="header" slot-scope="scope">
-                    <span>物品类型<span style="color: red">*</span></span>
-                  </template>
-
-                  <template slot-scope="scope">
-                    <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
-                    <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
-
-                    <el-form-item style="padding-top: 15px">
-                      <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
-                                :value="typeName(scope.row.good_type_id)"
-                                @focus="showDialog(scope.$index, scope.row)"></el-input>
-                    </el-form-item>
-
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="35" align="center">
-                  <template slot="header" slot-scope="scope">
-                    <span>规格名称<span style="color: red">*</span></span>
-                  </template>
-                  <template slot-scope="scope">
-
-                    <el-form-item style="padding-top: 15px">
-                      <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
-                                :value="specificationName(scope.row.good_id)"
-                                @focus="showDialog(scope.$index, scope.row)"></el-input>
-                    </el-form-item>
-
-                  </template>
-                </el-table-column>
-
-
-                <el-table-column min-width="23" align="center">
-                  <template slot="header" slot-scope="scope">
-                    <span>退货数量<span style="color: red">*</span></span>
-                  </template>
-                  <template slot-scope="scope">
-                    <!--{{scope.row.warehousing_count}}-->
-                    <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-
-                    <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count'
-                                  style="padding-top: 17px">
-                      <el-input type="number" v-model="scope.row.return_count"></el-input>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-
-              </el-table>
-            </el-form>
-          </el-col>
-
-
-          <span class="dialog-footer" style="margin-top: 20px;float:right">
-        <el-button @click="back()">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
-      </span>
-
-        </el-row>
+      <div class="cell">
+        <label class="title"><span class="name">退货时间</span> : </label>
+        <el-date-picker v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"></el-date-picker>
       </div>
 
-    </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">厂商</span> : </label>
+        <el-select v-model="form.manufacturer" clearable placeholder="请选择厂商">
+          <el-option
+            v-for="(option, index) in manufacturer"
+            :key="index"
+            :label="option.manufacturer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">经销商</span> : </label>
+        <el-select v-model="form.dealer" clearable placeholder="请选择经销商">
+          <el-option
+            v-for="(option, index) in dealer"
+            :key="index"
+            :label="option.dealer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                  max-height="450"  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+
+
+          <el-table-column min-width="35" align="center">
+
+            <template slot="header" slot-scope="scope">
+              <span>物品类型<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
+              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
+
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入物品类型" v-model="scope.row.good_type_id"
+                          :value="typeName(scope.row.good_type_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                          :value="specificationName(scope.row.good_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>退货数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--{{scope.row.warehousing_count}}-->
+              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+              <el-form-item :prop="'recordData.' + scope.$index + '.return_count'" :rules='tableRules.return_count'
+                            style="padding-top: 17px">
+                <el-input  placeholder="请输入退货数量" type="number" v-model="scope.row.return_count"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" min-width="20">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="新增" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-remove-outline"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+
+            </template>
+          </el-table-column>
+
+
+        </el-table>
+      </el-form>
+
+  </div>
   </div>
 
 </template>
@@ -394,15 +393,6 @@
 
   }
 
-  .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;

src/xt_pages/stock/salesReturnOrderDetail.vue

@@ -27,6 +27,7 @@
 
       <el-row :gutter="12" style="margin-top: 10px">
         <el-table :data="ReturnInfo.returnInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
@@ -210,14 +211,6 @@
 
   }
 
-  .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);

src/xt_pages/stock/salesReutrnRecord.vue

@@ -1,401 +0,0 @@
-<template>
-<div class="main-contain">
-  <div class="position">
-    <bread-crumb></bread-crumb>
-
-  </div>
-  <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>
-    </div>
-
-    <el-row :gutter="12">
-      <el-col :span="8">
-        <div class="title">入库退货记录
-        </div>
-        <div style="margin-bottom: 10px;">
-        </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="salesReturn.salesReturnDate" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  highlight-current-row
-                  @row-click="onRowClick"
-                  :row-class-name="tableRowClassName"
-                  v-loading="salesReturn.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
-          :page-sizes="[7]"
-          :page-size="7"
-          background
-          align="right"
-          style="margin-top:20px;"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
-        </el-pagination>
-      </el-col>
-
-      <el-col :span="16">
-        <div class="titleTop">物品详细信息
-        </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="salesReturnInfo.salesReturnInfoDate" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  v-loading="salesReturnInfo.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>
-  </div>
-</template>
-
-<script>
-  import {uParseTime} from "@/utils/tools";
-  import { fetchAllDoctorAndNurse,fetchAllAdminUsers } from "@/api/doctor";
-  import {
-    getSalesReturnList,
-    getSalesReturnInfoList,
-    GetAllGoodInfo,
-    GetAllGoodType,
-  } from "@/api/stock";
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-  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.GetSalesReturnList()
-      this.fetchAllAdminUsers()
-
-
-    },
-    components:{
-      BreadCrumb
-    },
-    data() {
-      return {
-        total:0,
-        adminUserOptions:[],
-        multipleSelection: [],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        end_time: '',
-        goodType:[],
-        goodInfo:[],
-
-        salesReturn: {
-          loading: false,
-          salesReturnDate: [],
-          tableCurrentIndex:''
-        },
-
-        salesReturnInfo: {
-          loading: false,
-          salesReturnInfoDate: [],
-        }
-      };
-    },
-    methods: {
-      GetSalesReturnList:function () {
-        let Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time
-        }
-        this.salesReturn.salesReturnDate = []
-        getSalesReturnList(Params).then(response =>{
-          if (response.data.state == 0) {
-            this.salesReturn.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.salesReturn.loading = false
-            this.total = response.data.data.total
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.salesReturn.salesReturnDate.push(response.data.data.list[i])
-            }
-          }
-        })
-      }, tableRowClassName({row, rowIndex}) {
-        //把每一行的索引放进row
-        row.index = rowIndex;
-      },
-      onRowClick(row, event, column) {
-        this.salesReturnInfo.salesReturnInfoDate = []
-        this.salesReturn.tableCurrentIndex = row.index;
-        let params = {
-          'id': row.id
-        }
-        this.salesReturnInfo.loading = true
-        getSalesReturnInfoList(params).then(response => {
-          if (response.data.state == 0) {
-            this.salesReturnInfo.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.salesReturnInfo.loading = false
-            for (let i = 0; i < response.data.data.info.length; i++) {
-              this.salesReturnInfo.salesReturnInfoDate.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])
-            }
-          }
-        });
-
-
-      },clicks:function () {
-
-      },handleWarehouse:function () {
-        this.$router.push({path:'/stock/in/add'})
-      },handleReturnSales:function () {
-        // this.$router.push({path:'/patients/create'}
-        if(this.multipleSelection.length <= 0){
-          this.$message.error('请选择退货物品');
-          return
-        }
-
-        let ids = []
-        for (let i = 0; i < this.multipleSelection.length; i++){
-          ids.push(this.multipleSelection[i].id)
-
-        }
-        this.$router.push({name:'salesReturn',query:{id:ids.join("&")}});
-
-      },handleReturnSalesRecord:function () {
-
-      }, handleWarehouseRecord:function () {
-
-      },handleSelectionChange:function (val) {
-        this.multipleSelection = val
-      },startTimeChange:function () {
-        this.GetSalesReturnList()
-      },endTimeChange:function () {
-        this.GetSalesReturnList()
-      }
-
-
-    },
-    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/stockIn.vue

@@ -1,436 +0,0 @@
-<template>
-<div class="main-contain">
-  <div class="position">
-    <bread-crumb></bread-crumb>
-    <el-row style="float:right;">
-        <el-button size="small" icon="el-icon-sold-out" @click="handleReturnSales" >退货</el-button>        
-        <el-button size="small" icon="el-icon-setting" @click="handleWarehouse" type="primary">入库</el-button>
-        <el-button size="small" icon="el-icon-edit-outline" @click="handleWarehouseRecord" type="danger">入库记录</el-button>
-        <el-button size="small" icon="el-icon-document" @click="handleReturnSalesRecord" type="warning">退货记录</el-button>
-    </el-row>
-  </div>
-  <div class="app-container sign-and-weigh-box">
-    <div class="cell">
-      <label class="title" ><span class="name">入库时间:</span></label>
-      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-      <span class="">-</span>
-      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
-    </div>
-
-    <el-row :gutter="12">
-      <el-col :span="8">
-        <div class="titleTop">入库记录
-        </div>
-        <div style="margin-bottom: 10px;">
-        </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="Warehouse.warehouseDate" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  highlight-current-row
-                  @row-click="onRowClick"
-                  :row-class-name="tableRowClassName"
-                  v-loading="Warehouse.loading"
-        >
-          <el-table-column label="入库单号" min-width="40" align="center">
-            <template slot-scope="scope">
-              {{scope.row.warehousing_order}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="入库时间" min-width="40" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.warehousing_time | parseTime("{y}-{m}-{d}")}}
-              <!--<input/>-->
-              <!--<span></span>-->
-            </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-col>
-
-      <el-col :span="16">
-        <div class="titleTop">物品详细信息
-        </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="WarehouseInfo.warehouseInfoDate" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  v-loading="WarehouseInfo.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">
-              <span :class="scope.row.is_return == 1 ? 'count':''">{{scope.row.warehousing_count}}</span>
-            </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">
-              {{calculate(scope.row.price*scope.row.warehousing_count)}}
-
-
-            </template>
-          </el-table-column>
-          <el-table-column label="物品批号" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.number}}
-            </template>
-          </el-table-column>
-          <el-table-column label="生产日期" min-width="30" align="center">
-            <template slot-scope="scope" v-if="scope.row.product_date != 0">
-              {{scope.row.product_date | parseTime("{y}-{m}-{d}")}}
-            </template>
-          </el-table-column>
-          <el-table-column label="有效日期" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}
-
-            </template>
-          </el-table-column>
-        </el-table>
-
-      </el-col>
-    </el-row>
-
-     <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
-          background
-          align="right"
-          style="margin-top:10px;"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
-        </el-pagination>
-
-  </div>
-</div>
-</template>
-
-<script>
-  import {uParseTime} from "@/utils/tools";
-  import {fetchAllDoctorAndNurse, fetchAllAdminUsers} from "@/api/doctor";
-  import {
-    getWarehouseList,
-    getWarehouseInfoList,
-    GetAllGoodInfo,
-    GetAllGoodType,
-  } from "@/api/stock";
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-  export default {
-    name: "stockIn",
-    components:{
-      BreadCrumb
-    },
-    created() {
-      var year = new Date().getFullYear();
-      var month = new Date().getMonth() + 1;
-      var day = new Date().getDate();
-      if (parseInt(month) < 10) {
-        month = "0" + month;
-      }
-      if (parseInt(day) < 10) {
-        day = "0" + day;
-      }
-      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.GetWarehouse()
-      this.GetAllGoodInfo()
-      this.GetAllGoodType()
-      this.fetchAllAdminUsers()
-
-      sessionStorage.setItem("111","2222")
-
-
-    },
-    data() {
-      return {
-        page: 1,
-        limit: 7,
-
-        total: 0,
-        pageTotal: 0,
-        pageSelect: 0,
-        adminUserOptions:[],
-        multipleSelection: [],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        end_time: '',
-        goodType: [],
-        goodInfo: [],
-        Warehouse: {
-          loading: false,
-          warehouseDate: [],
-          tableCurrentIndex: ''
-        },
-
-        WarehouseInfo: {
-          loading: false,
-          warehouseInfoDate: [],
-        }
-      };
-    },
-    methods: {
-      GetWarehouse: function () {
-        let Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time
-        }
-        this.Warehouse.warehouseDate = []
-        getWarehouseList(Params).then(response => {
-          if (response.data.state == 0) {
-
-            this.Warehouse.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.Warehouse.loading = false
-            this.total = response.data.data.total
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.Warehouse.warehouseDate.push(response.data.data.list[i])
-            }
-          }
-        });
-
-      }, tableRowClassName({row, rowIndex}) {
-        //把每一行的索引放进row
-        row.index = rowIndex;
-      },
-      onRowClick(row, event, column) {
-        this.WarehouseInfo.warehouseInfoDate = []
-        this.Warehouse.tableCurrentIndex = row.index;
-        let params = {
-          'id': row.id
-        }
-        this.WarehouseInfo.loading = true
-        getWarehouseInfoList(params).then(response => {
-          if (response.data.state == 0) {
-            this.WarehouseInfo.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.WarehouseInfo.loading = false
-            for (let i = 0; i < response.data.data.info.length; i++) {
-              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i])
-            }
-          }
-        });
-
-      }, getXuserName(id) {
-        if (id <= 0) {
-          return "";
-        }
-        var name = "";
-        if (this.adminUserOptions == null || typeof(this.adminUserOptions.length) == "undefined") {
-          return name;
-        }
-        var leng = this.adminUserOptions.length;
-        if (leng == 0) {
-          return name;
-        }
-        for (let index = 0; index < leng; index++) {
-          if (this.adminUserOptions[index].id == id) {
-            name = this.adminUserOptions[index].name;
-            break;
-          }
-        }
-        return name;
-      }, fetchAllDoctorAndNurse() {
-        fetchAllDoctorAndNurse().then(response => {
-          if (response.data.state == 1) {
-            this.doctorOptions = response.data.data.doctors;
-          }
-        });
-      },
-      fetchAllAdminUsers() {
-        fetchAllAdminUsers().then(response => {
-          console.log(response)
-          if (response.data.state == 1) {
-            this.adminUserOptions = response.data.data.users;
-            var alen = this.adminUserOptions.length;
-            for (let index = 0; index < alen; index++) {
-              if (this.adminUserOptions[index].user_type == 2) {
-                // this.doctorOptions.push(this.adminUserOptions[index]);
-              }
-            }
-          }
-        });
-      }, getSpecificationName: function (id) {
-        let name = ''
-        for (let i = 0; i < this.goodInfo.length; i++) {
-          if (this.goodInfo[i].id == id) {
-            name = this.goodInfo[i].specification_name
-          }
-
-        }
-
-        return name
-
-      }, getTypeName: function (id) {
-        let name = ''
-        for (let i = 0; i < this.goodType.length; i++) {
-          if (this.goodType[i].id == id) {
-            name = this.goodType[i].type_name
-          }
-        }
-        return name
-      }, GetAllGoodType: function () {
-        GetAllGoodType().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodType.length; i++) {
-              this.goodType.push(response.data.data.goodType[i])
-            }
-          }
-        });
-
-
-      }, GetAllGoodInfo: function () {
-        GetAllGoodInfo().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-              this.goodInfo.push(response.data.data.goodInfo[i])
-            }
-          }
-        });
-
-
-      }, clicks: function () {
-        console.log(this.WarehouseInfo.warehouseInfoDate)
-
-      }, handleWarehouse: function () {
-        sessionStorage.removeItem("warehousing_orders")
-        this.$router.push({path: '/stock/in/add'})
-      }, handleReturnSales: function () {
-        // this.$router.push({path:'/patients/create'}
-        if (this.multipleSelection.length <= 0) {
-          this.$message.error('请选择退货物品');
-          return
-        }
-
-        let ids = []
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          ids.push(this.multipleSelection[i].id)
-
-        }
-        this.$router.push({name: 'salesReturn', query: {id: ids.join("&")}});
-
-      }, handleReturnSalesRecord: function () {
-        this.$router.push({name: 'salesReutrnRecord'});
-
-      }, handleWarehouseRecord: function () {
-        this.$router.push({name: 'warehouseRecord'});
-
-
-      }, handleSelectionChange: function (val) {
-        this.multipleSelection = val
-      }, handleSizeChange(val) {
-        this.limit = val;
-        this.GetWarehouse();
-      }, handleCurrentChange(val) {
-        this.page = val;
-        this.GetWarehouse();
-      }, startTimeChange(val) {
-        this.GetWarehouse();
-      }, endTimeChange(val) {
-        this.GetWarehouse();
-      }, calculate: function (val) {
-        return Math.round(parseFloat(val) * 100) / 100
-      }
-    },
-  };
-</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;
-    }
-  }
-
-  .titleTop {
-    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;
-        font-size: 14px;
-  }
-
-  .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/stockInOrder.vue

@@ -9,7 +9,7 @@
 
     <div class="app-container">
     <div class="filter-container">
-      <el-input   style="width: 400px;" v-model="searchKey" class="filter-item" />
+      <el-input   style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据日期/单据编码/制单人/供应商" />
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
     </div>
 
@@ -376,7 +376,7 @@
           }
         }
       }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'stockInDetail', query: { id: row.id }})
+        this.$router.push({ name: 'stockInDetail', query: { id: row.id, type: this.type }})
       }, handleDelete: function(index, row) {
         const ids = []
         ids.push(row.id)

src/xt_pages/stock/stockInOrderAdd.vue

@@ -3,6 +3,10 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div style="float:right;">
+      <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+      <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+      </div>
     </div>
     <div class="app-container">
 
@@ -11,69 +15,42 @@
                        v-on:dialog-comfirm="comfirm"
                        v-on:dialog-cancle="cancle"></stock-in-dialog>
 
-      <div class="filter-container">
-
-        <el-row>
-          <el-col :span="8">
-            <el-form ref="form" :model="form" label-width="100px">
-              <el-form-item label="入库时间：">
-                <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>
-              </el-form-item>
-            </el-form>
-          </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>
-
-
-        <el-row>
-          <el-col>
+
+      <div class="cell">
+        <label class="title"><span class="name">入库时间</span> : </label>
+        <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>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">厂商</span> : </label>
+        <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" >
+          <el-option
+            v-for="(option, index) in manufacturer"
+            :key="index"
+            :label="option.manufacturer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">经销商</span> : </label>
+        <el-select  v-model="form.dealer" clearable  placeholder="请选择经销商" >
+          <el-option
+            v-for="(option, index) in dealer"
+            :key="index"
+            :label="option.dealer_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+
             <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
               <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                        max-height="450"
+                        max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
               >
 
-                <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">
@@ -154,7 +131,7 @@
 
                   </template>
                 </el-table-column>
-                <el-table-column label="生产日期" min-width="40" align="center">
+                <el-table-column label="生产日期" min-width="43" align="center">
                   <template slot-scope="scope">
                     <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
                     <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
@@ -163,7 +140,7 @@
 
                   </template>
                 </el-table-column>
-                <el-table-column label="有效日期" min-width="40" align="center">
+                <el-table-column label="有效日期" min-width="43" 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"
@@ -177,19 +154,34 @@
                     <el-input v-model="scope.row.remark"></el-input>
                   </template>
                 </el-table-column>
-              </el-table>
-            </el-form>
-          </el-col>
 
+                <el-table-column label="操作" align="center" min-width="40">
+                  <template slot-scope="scope">
+                    <el-tooltip class="item" effect="dark" content="新增" placement="top">
+
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      icon="el-icon-circle-plus-outline"
+                      @click="handleEdit(scope.$index, scope.row)">
+                    </el-button>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                    <el-button
+                      size="mini"
+                      type="danger"
+                      icon="el-icon-remove-outline"
+                      @click="handleDelete(scope.$index, scope.row)">
+                    </el-button>
+                    </el-tooltip>
 
-          <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>
+                  </template>
+                </el-table-column>
 
-        </el-row>
+              </el-table>
+            </el-form>
 
-      </div>
 
     </div>
   </div>
@@ -605,15 +597,6 @@
 
   }
 
-  .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;

src/xt_pages/stock/stockInOrderDetail.vue

@@ -24,6 +24,7 @@
 
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table :data="WarehouseInfo.warehouseInfoDate" :class="signAndWeighBoxPatients" style="width: 100%" border
+                :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       >
         <el-table-column min-width="35" align="center">
           <template slot="header" slot-scope="scope">
@@ -256,14 +257,7 @@
 
   }
 
-  .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);

src/xt_pages/stock/stockInOrderEdit.vue

@@ -2,55 +2,32 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div style="float:right;">
+        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+      </div>
     </div>
 
-  <div class="app-container sign-and-weigh-box">
+  <div class="app-container">
 
     <stock-in-dialog :propForm="propForm"
                      :visibility="isVisibility"
                      v-on:dialog-comfirm="comfirm"
                      v-on:dialog-cancle="cancle"></stock-in-dialog>
 
-    <div class="filter-container">
 
-      <el-row>
-        <el-col :span="8"><div>
-          <span>入库时间:</span>
-          <el-date-picker v-model="warehousing_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"></el-date-picker>
-        </div></el-col>
-      </el-row>
+
+    <div class="cell">
+      <label class="title"><span class="name">入库时间</span> : </label>
+      <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-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"
+                    max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           >
 
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" content="编辑" placement="top">  
-                  <el-button
-                    size="small"
-                    type="primary"
-                    icon="el-icon-edit-outline"
-                    @click="handleEdit(scope.$index, scope.row)">
-                  </el-button>
-                  </el-tooltip>
-                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                    <el-button
-                      size="small"
-                      type="danger"
-                      icon="el-icon-delete"
-                      @click="handleDelete(scope.$index, scope.row)">
-                    </el-button>
-                </el-tooltip>     
-              </template>
-            </el-table-column>
-
             <el-table-column min-width="35" align="center">
 
               <template slot="header" slot-scope="scope">
@@ -153,17 +130,34 @@
                 <el-input  v-model="scope.row.remark"></el-input>
               </template>
             </el-table-column>
-          </el-table>
-        </el-form>
-      </el-col>
 
+            <el-table-column label="操作" align="center" min-width="40">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
-      <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-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-circle-plus-outline"
+                    @click="handleEdit(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
 
-    </el-row>
+                  <el-button
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-remove-outline"
+                    @click="handleDelete(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+
+              </template>
+            </el-table-column>
+          </el-table>
+
+
+        </el-form>
   </div>
   </div>
 
@@ -489,15 +483,6 @@ export default {
   }
   }
 
-  .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);

src/xt_pages/stock/stockOut.vue

@@ -1,420 +0,0 @@
-<template>
-<div class="main-contain">
-  <div class="position">
-    <bread-crumb></bread-crumb>
-     <el-row style="float:right;">
-        <el-button size="small" icon="el-icon-sold-out"  @click="handleWarehouseOutReturn">出库退库</el-button>        
-        <el-button size="small" icon="el-icon-setting" type="primary"  @click="handleWarehouseOut">出库</el-button>
-        <el-button size="small" icon="el-icon-edit-outline" type="danger" @click="handleWarehouseOutRecord">出库记录</el-button>        
-        <el-button size="small" icon="el-icon-document" type="warning" @click="handleWarehouseOutReturnRecord">退库记录</el-button>
-      </el-row>
-  </div>
-  <div class="app-container sign-and-weigh-box">
-    <div class="cell">
-      <label for="" class="title"><span class="name">出库时间:</span></label>
-      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-      <span class="">-</span>
-      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
-    </div>
-
-
-    <el-row :gutter="12">
-      <el-col :span="8">
-        <div class="titleTop">出库记录
-        </div>
-        <div style="margin-bottom: 10px;">
-        </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="WarehouseOut.warehouseOutDate" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  highlight-current-row
-                  @row-click="onRowClick"
-                  :row-class-name="tableRowClassName"
-                  v-loading="WarehouseOut.loading"
-        >
-          <el-table-column label="出库单号" min-width="40" align="center">
-            <template slot-scope="scope">
-              {{scope.row.warehouse_out_order_number}}
-            </template>
-          </el-table-column>
-          <el-table-column label="出库时间" min-width="40" 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" min-width="30">
-            <template slot-scope="scope">
-              {{getXuserName(scope.row.creater)}}
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </el-col>
-
-      <el-col :span="16">
-        <div class="titleTop">物品详细信息
-        </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="WarehouseOutInfo.warehouseOutInfoDate" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  v-loading="WarehouseOutInfo.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">
-
-              <span :class="scope.row.is_cancel == 1 ? 'count':''">{{scope.row.count}}</span>
-
-            </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">
-
-              {{calculate(scope.row.price * scope.row.count) }}
-
-            </template>
-          </el-table-column>
-        </el-table>
-
-      </el-col>
-    </el-row>
-    
-    <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
-          background
-          align="right"
-          style="margin-top:20px;"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
-        </el-pagination>
-
-  </div>
-  </div>
-  
-</template>
-
-<script>
-  import {uParseTime} from "@/utils/tools";
-  import { fetchAllDoctorAndNurse,fetchAllAdminUsers } from "@/api/doctor";
-  import {
-    getWarehouseOutList,
-    getWarehouseOutInfoList,
-    GetAllGoodInfo,
-    GetAllGoodType,
-  } from "@/api/stock";
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-  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.GetWarehouseOut()
-      this.GetAllGoodInfo()
-      this.GetAllGoodType()
-      this.fetchAllAdminUsers()
-
-    },
-    components:{
-      BreadCrumb
-    },
-    data() {
-      return {
-        page: 1,
-        limit: 7,
-
-        total: 0,
-        pageTotal: 0,
-        pageSelect: 0,
-        adminUserOptions:[],
-        multipleSelection:[],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        end_time: '',
-        goodType:[],
-        goodInfo:[],
-        WarehouseOut: {
-          loading: false,
-          warehouseOutDate: [],
-          tableCurrentIndex:''
-        },
-
-        WarehouseOutInfo: {
-          loading: false,
-          warehouseOutInfoDate: [],
-        }
-      };
-    },
-    methods: {
-      GetWarehouseOut:function () {
-        // this.Warehouse.loading = true
-        let Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time
-        }
-        this.WarehouseOut.warehouseOutDate = []
-        this.WarehouseOutInfo.warehouseOutInfoDate = []
-
-        getWarehouseOutList(Params).then(response => {
-          if (response.data.state == 0) {
-
-            this.WarehouseOut.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.total = response.data.data.total
-            this.WarehouseOut.loading = false
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.WarehouseOut.warehouseOutDate.push(response.data.data.list[i])
-            }
-          }
-        });
-
-      },tableRowClassName({row, rowIndex}) {
-        //把每一行的索引放进row
-        row.index = rowIndex;
-      },
-      onRowClick(row, event, column) {
-        this.WarehouseOutInfo.warehouseOutInfoDate = []
-        this.WarehouseOut.tableCurrentIndex = row.index;
-        let params = {
-          'id': row.id
-        }
-        this.WarehouseOutInfo.loading = true
-        getWarehouseOutInfoList(params).then(response => {
-          if (response.data.state == 0) {
-            this.WarehouseOutInfo.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.WarehouseOutInfo.loading = false
-            for (let i = 0; i < response.data.data.info.length; i++) {
-              this.WarehouseOutInfo.warehouseOutInfoDate.push(response.data.data.info[i])
-            }
-          }
-        });
-
-      }, getXuserName(id){
-        if (id<=0) {
-          return "";
-        }
-        var name = "";
-        console.log(this.adminUserOptions)
-        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;
-
-          }
-        });
-      },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])
-            }
-          }
-        });
-
-
-      },handleWarehouseOut:function () {
-        sessionStorage.removeItem("warehousing_out_orders")
-        this.$router.push({name:'addStockOut'});
-
-      },handleWarehouseOutReturn:function () {
-
-        if(this.multipleSelection.length <= 0){
-          this.$message.error('请选择退库物品');
-          return
-        }
-
-        let ids = []
-        for (let i = 0; i < this.multipleSelection.length; i++){
-          ids.push(this.multipleSelection[i].id)
-
-        }
-        this.$router.push({name:'cancelStock',query:{id:ids.join("&")}});
-
-
-      },handleWarehouseOutReturnRecord:function () {
-
-        this.$router.push({name:'cancelStockRecord'});
-
-      },handleWarehouseOutRecord:function () {
-        this.$router.push({name:'stockOutRecord'});
-
-      },handleSelectionChange:function (val) {
-        this.multipleSelection = val
-      },calculate:function (val) {
-        return Math.round(parseFloat(val)*100)/100
-      }, startTimeChange(val) {
-        this.GetWarehouseOut();
-      }, endTimeChange(val) {
-        this.GetWarehouseOut();
-      }, handleSizeChange(val) {
-        this.limit = val;
-        this.GetWarehouseOut();
-      }, handleCurrentChange(val) {
-        this.page = val;
-        this.GetWarehouseOut();
-      },
-    },
-  };
-</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;
-    }
-  }
-
-  .titleTop {
-    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;
-        font-size: 14px;
-  }
-
-  .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/stockOutOrder.vue

@@ -74,12 +74,16 @@
 
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+
             <el-button
               size="mini"
               type="primary"
               icon="el-icon-edit"
               @click="handleEdit(scope.$index, scope.row)">
             </el-button>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="删除" placement="top">
 
             <el-button
               size="mini"
@@ -87,6 +91,8 @@
               icon="el-icon-delete"
               @click="handleDelete(scope.$index, scope.row)">
             </el-button>
+            </el-tooltip>
+
           </template>
         </el-table-column>
       </el-table>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -3,6 +3,10 @@
   <div class="main-contain">
     <div class="position">
     <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div style="float:right;">
+        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+      </div>
   </div>
 
   <div class="app-container">
@@ -12,72 +16,44 @@
                          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>
+    <div class="cell">
+        <label class="title"><span class="name">出库时间</span> : </label>
           <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>
+
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">厂商</span> : </label>
+      <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" >
+        <el-option
+          v-for="(option, index) in manufacturer"
+          :key="index"
+          :label="option.manufacturer_name"
+          :value="option.id">
+        </el-option>
+      </el-select>
+    </div>
 
+    <div class="cell clearfix">
+      <label class="title"><span class="name">经销商</span> : </label>
+      <el-select  v-model="form.dealer" clearable  placeholder="请选择经销商" >
+        <el-option
+          v-for="(option, index) in dealer"
+          :key="index"
+          :label="option.dealer_name"
+          :value="option.id">
+        </el-option>
+      </el-select>
     </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"
+                    max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           >
 
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" content="编辑" placement="top">  
-                  <el-button
-                    size="small"
-                    type="primary"
-                    icon="el-icon-edit-outline"
-                    @click="handleEdit(scope.$index, scope.row)">
-                  </el-button>
-                  </el-tooltip>
-                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                    <el-button
-                      size="small"
-                      type="danger"
-                      icon="el-icon-delete"
-                      @click="handleDelete(scope.$index, scope.row)">
-                    </el-button>
-                </el-tooltip>     
-
-              </template>
-            </el-table-column>
-
             <el-table-column min-width="35" align="center">
 
               <template slot="header" slot-scope="scope">
@@ -115,7 +91,7 @@
               <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-input placeholder="请输入单价" type="number"  v-model="scope.row.price" ></el-input>
                 </el-form-item>
 
 
@@ -128,7 +104,7 @@
               </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-input placeholder="请输入出库数量" type="number"  v-model="scope.row.count" ></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -143,17 +119,32 @@
                 <el-input  v-model="scope.row.remark"></el-input>
               </template>
             </el-table-column>
-          </el-table>
-        </el-form>
-      </el-col>
 
+            <el-table-column label="操作" align="center" min-width="20">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
-      <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-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-circle-plus-outline"
+                    @click="handleEdit(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
 
-    </el-row>
+                  <el-button
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-remove-outline"
+                    @click="handleDelete(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
   </div>
   </div>
 
@@ -429,15 +420,6 @@
   }
   }
 
-  .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);

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -27,7 +27,7 @@
 
       <el-row :gutter="12" style="margin-top: 10px">
         <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
-                  border
+                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
@@ -237,14 +237,6 @@
 
   }
 
-  .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);

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -2,6 +2,10 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div style="float:right;">
+        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >确 定</el-button>
+      </div>
     </div>
 
   <div class="app-container">
@@ -11,49 +15,18 @@
                      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;"
+    <div class="cell">
+      <label class="title"><span class="name">出库时间</span> : </label>
+      <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"
+                    max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           >
 
-            <el-table-column label="操作" align="center" min-width="30">
-              <template slot-scope="scope">
-                 <el-tooltip class="item" effect="dark" content="编辑" placement="top">  
-                  <el-button
-                    size="small"
-                    type="primary"
-                    icon="el-icon-edit-outline"
-                    @click="handleEdit(scope.$index, scope.row)">
-                  </el-button>
-                  </el-tooltip>
-                  <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                    <el-button
-                      size="small"
-                      type="danger"
-                      icon="el-icon-delete"
-                      @click="handleDelete(scope.$index, scope.row)">
-                    </el-button>
-                </el-tooltip>     
-
-              </template>
-            </el-table-column>
-
             <el-table-column min-width="35" align="center">
 
               <template slot="header" slot-scope="scope">
@@ -119,17 +92,32 @@
                 <el-input  v-model="scope.row.remark"></el-input>
               </template>
             </el-table-column>
-          </el-table>
-        </el-form>
-      </el-col>
+            <el-table-column label="操作" align="center" min-width="20">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
+                  <el-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-circle-plus-outline"
+                    @click="handleEdit(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
 
-      <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-button
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-remove-outline"
+                    @click="handleDelete(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
 
-    </el-row>
   </div>
   </div>
 
@@ -414,16 +402,6 @@
 
   }
 
-  .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;

src/xt_pages/stock/stockOutRecord.vue

@@ -1,270 +0,0 @@
-<template>
-<div class="main-contain">
-  <div class="position">
-    <bread-crumb></bread-crumb>
-    <el-row style="float:right;">
-        <el-button size="small" icon="el-icon-refresh" @click="handleBack">返回</el-button>
-    </el-row>
-  </div>
-  <div class="app-container sign-and-weigh-box">
-    <div class="cell">
-      <label for="" class="title"><span class="name">出库时间:</span></label>
-      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-      <span class="">-</span>
-      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
-
-    </div>
-    <el-row :gutter="12">
-      <div class="titleTop">出库记录
-      </div>
-      <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="WarehouseOutInfo.warehouseOutInfoDate" :class="signAndWeighBoxPatients" border
-                v-loading="WarehouseOutInfo.loading"
-      >
-        <el-table-column
-          type="selection"
-        >
-        </el-table-column>
-        <el-table-column label="规格名称" align="center">
-          <template slot-scope="scope">
-            {{getSpecificationName(scope.row.good_id)}}
-          </template>
-        </el-table-column>
-        <el-table-column label="物品类型" align="center">
-          <template slot-scope="scope">
-            {{getTypeName(scope.row.good_type_id)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="出库数量" align="center">
-          <template slot-scope="scope">
-            <span>{{scope.row.count}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="出库单价" align="center">
-          <template slot-scope="scope">
-            {{scope.row.price}}
-
-          </template>
-        </el-table-column>
-        <el-table-column label="出库总价" align="center">
-          <template slot-scope="scope">
-
-            {{calculate(scope.row.price * scope.row.count) }}
-
-
-          </template>
-        </el-table-column>
-        <el-table-column label="" align="center">
-          <template slot-scope="scope">
-            {{scope.row.WarehouseOut.warehouse_out_time | parseTime("{y}-{m}-{d}")}}
-
-          </template>
-        </el-table-column>
-        <el-table-column label="出库单号" align="center">
-          <template slot-scope="scope">
-            {{scope.row.WarehouseOut.warehouse_out_order_number}}
-          </template>
-        </el-table-column>
-
-      </el-table>
-
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[7]"
-        :page-size="7"
-        background
-        align="right"
-        style="margin-top:20px;"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total">
-      </el-pagination>
-    </el-row>
-  </div>
-  </div>
-
-</template>
-
-<script>
-  import {uParseTime} from "@/utils/tools";
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-  import {
-    getAllStockOutList,
-    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.GetWarehouse()
-      this.GetAllGoodInfo()
-      this.GetAllGoodType()
-
-
-    },
-    components:{
-      BreadCrumb
-    },
-    data() {
-      return {
-        total:0,
-        multipleSelection: [],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        end_time: '',
-        goodType: [],
-        goodInfo: [],
-        WarehouseOutInfo: {
-          loading: false,
-          warehouseOutInfoDate: [],
-        }
-      };
-    },
-    methods: {
-      GetWarehouse: function () {
-        let Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time
-        }
-        this.WarehouseOutInfo.warehouseOutInfoDate = []
-        getAllStockOutList(Params).then(response => {
-          if (response.data.state == 0) {
-            this.WarehouseOutInfo.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.WarehouseOutInfo.loading = false
-            this.total = response.data.data.total
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.WarehouseOutInfo.warehouseOutInfoDate.push(response.data.data.list[i])
-            }
-          }
-        });
-      }, 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])
-            }
-          }
-        });
-      }, handleBack: function () {
-        this.$router.go(-1)
-      } ,startTimeChange(val) {
-        this.GetWarehouse();
-      }, endTimeChange(val) {
-        this.GetWarehouse();
-      },calculate:function (val) {
-        return Math.round(parseFloat(val)*100)/100
-      },
-    }
-  };
-</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;
-    }
-  }
-
-  .titleTop {
-    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;
-        font-size: 14px;
-  }
-
-  .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/stockQuery.vue

@@ -1,13 +1,10 @@
 <template>
 <div class="main-contain">
   <div class="position">
-    <bread-crumb></bread-crumb>
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
 
   </div>
-  <div class="app-container sign-and-weigh-box">
-    <el-row :gutter="12">
-      <div class="title">库存列表
-      </div>
+  <div class="app-container ">
       <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}"  :data="WarehouseInfo.warehouseInfoDate" :class="signAndWeighBoxPatients" border
                 v-loading="WarehouseInfo.loading"
       >
@@ -75,11 +72,9 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
       </el-pagination>
-
-    </el-row>
   </div>
   </div>
-  
+
 </template>
 
 <script>
@@ -103,6 +98,11 @@
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/query', name: '库存查询' },
+        ],
+
         total: 0,
         multipleSelection: [],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',

src/xt_pages/stock/warehouseRecord.vue

@@ -1,304 +0,0 @@
-<template>
-<div class="main-contain">
-  <div class="position">
-    <bread-crumb></bread-crumb>
-    <el-row style="float:right;">
-        <el-button size="small" icon="el-icon-refresh" @click="handleBack" type="primary">返回</el-button>
-      </el-row>
-  </div>
-  <div class="app-container sign-and-weigh-box">
-    <div class="cell">
-      <label  class="title"><span class="name">入库时间:</span></label>
-      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-      <span class="">-</span>
-      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
-
-    </div>
-    <el-row :gutter="12">
-      <div class="titleTop">入库记录
-      </div>
-      <el-table  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="WarehouseInfo.warehouseInfoDate" :class="signAndWeighBoxPatients" border
-                v-loading="WarehouseInfo.loading"
-      >
-        <el-table-column
-          type="selection"
-        >
-        </el-table-column>
-        <el-table-column label="规格名称" align="center">
-          <template slot-scope="scope">
-            {{getSpecificationName(scope.row.good_id)}}
-          </template>
-        </el-table-column>
-        <el-table-column label="物品类型" align="center">
-          <template slot-scope="scope">
-            {{getTypeName(scope.row.good_type_id)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="入库数量" align="center">
-          <template slot-scope="scope">
-            <span>{{scope.row.warehousing_count}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="入库单价" align="center">
-          <template slot-scope="scope">
-            {{scope.row.price}}
-
-          </template>
-        </el-table-column>
-        <el-table-column label="入库总价" align="center">
-          <template slot-scope="scope">
-            {{calculate(scope.row.price * scope.row.warehousing_count)}}
-
-          </template>
-        </el-table-column>
-        <el-table-column label="入库时间" align="center">
-          <template slot-scope="scope">
-            {{scope.row.Warehousing.warehousing_time | parseTime("{y}-{m}-{d}")}}
-
-          </template>
-        </el-table-column>
-        <el-table-column label="入库单号" align="center">
-          <template slot-scope="scope">
-            {{scope.row.Warehousing.warehousing_order}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作" align="center">
-          <template slot-scope="scope">
-           <el-tooltip class="item" effect="dark" content="删除" placement="top">
-            <el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteRows(scope.row)"></el-button>
-           </el-tooltip>
-          </template>
-        </el-table-column>
-
-      </el-table>
-
-
-      <el-pagination
-        :page-sizes="[7]"
-        :page-size="7"
-        background
-        align="right"
-        style="margin-top:20px;"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total">
-      </el-pagination>
-
-    </el-row>
-  </div>
-</div>
-</template>
-
-<script>
-  import {uParseTime} from "@/utils/tools";
-  import {deleteStockInRecord, GetAllGoodInfo, GetAllGoodType, getAllWarehouseInfo} from "@/api/stock";
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-  
-  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.GetWarehouse()
-      this.GetAllGoodInfo()
-      this.GetAllGoodType()
-    },
-    components:{
-      BreadCrumb
-    },
-    data() {
-      return {
-        total: 0,
-        multipleSelection: [],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        end_time: '',
-        page: 1,
-        limit: 7,
-        goodType: [],
-        goodInfo: [],
-        WarehouseInfo: {
-          loading: false,
-          warehouseInfoDate: [],
-        }
-      };
-    },
-    methods: {
-      GetWarehouse: function () {
-        let Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time
-        }
-        this.WarehouseInfo.warehouseInfoDate = []
-        getAllWarehouseInfo(Params).then(response => {
-          if (response.data.state == 0) {
-            this.WarehouseInfo.loading = false
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.WarehouseInfo.loading = false
-            this.total = response.data.data.total
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.list[i])
-            }
-          }
-        });
-      }, 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])
-            }
-          }
-        });
-      }, handleBack: function () {
-        this.$router.go(-1)
-      }, handleSizeChange(val) {
-        this.limit = val;
-        this.GetWarehouse();
-      }, handleCurrentChange(val) {
-        this.page = val;
-        this.GetWarehouse();
-      }, calculate: function (val) {
-        return Math.round(parseFloat(val) * 100) / 100
-      }, startTimeChange: function () {
-        this.GetWarehouse()
-      }, endTimeChange: function () {
-        this.GetWarehouse()
-
-      },deleteRows:function (row) {
-        let params = {
-          record_id: row.id,
-          good_id: row.good_id,
-          order_number: row.Warehousing.warehousing_order,
-        }
-        deleteStockInRecord(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            this.$message.success(response.data.data.msg);
-
-            for (let i = 0; i < this.WarehouseInfo.warehouseInfoDate.length; i++){
-              console.log(this.WarehouseInfo.warehouseInfoDate[i].id)
-              console.log(row.id)
-
-              if (this.WarehouseInfo.warehouseInfoDate[i].id == row.id){
-                this.WarehouseInfo.warehouseInfoDate.splice(i,1)
-              }
-            }
-
-          }
-        });
-
-      }
-    }
-  };
-</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;
-  }
-
-  }
-
-  .titleTop {
-    background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    color: #fff;
-    margin: 0 0 10px 0;
-  //  border-radius: 4 px 4 px 0 0;
-      font-size: 14px;
-  }
-
-  .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>