Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

haoxuan

2023-10-19 f73080c69548aba58d6a58e7e049d8eb79f9f7ed

Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

 src/components/makepager/TableCommonView.vue

@@ -33,6 +33,8 @@
        :min-width="item.min"
        show-overflow-tooltip
        :sortable="item.sortable"
        header-align="center"
        :align="item.textAlign"
        v-if="item.isShowColumn"
      >
        <template slot-scope="scope">
@@ -115,7 +117,7 @@
          highlight: false,
          tableColumn: [
            // table表单
            { label: "", prop: "", min: 200, tooltip: true }
            { label: "", prop: "", min: 200, tooltip: true,textAlign:"center"}
          ]
        }
      },
@@ -242,7 +244,7 @@
                  }
                }, 0)
                let unitIndex = this.tableList.tableColumn.findIndex(obj => obj.label === column.label);  
                sums[index]+=this.tableList.tableColumn[unitIndex].unit
                sums[index]=this.tableList.tableColumn[unitIndex].unit+sums[index]
              } else {
                sums[index] = ""
              }
@@ -371,14 +373,21 @@
  .el-table .cell .el-button--text.el-button--small {
    padding: 4px 0;
  }
  .el-table .el-table__cell {
    padding: 6px 0 !important;
    height: 35px;
    text-align: center;
  }
  .el-table__body-wrapper{
    height: unset !important;
  }
  .el-table__cell.is-left{
    text-align: left !important;
  }
  .el-table__cell.is-right{
    text-align: right !important;
  }
}

::v-deep .el-table .el-table__cell {
  padding: 6px 0 !important;
  height: 35px;
  text-align: center;
}

.overSpread1 {
  width: 100%;
  height: 100%;
@@ -388,4 +397,7 @@
  background: rgba(0, 0, 0, 0);
  z-index: 10;
}
.el-table__cell{
  text-align: unset !important;
}
</style>

 src/views/operate/inventoryAdjustment/index.vue

@@ -88,7 +88,7 @@
      differenceAmount: 0,
      amount: 0,
      operationId: 0,
      adjustAmount:0,
      adjustAmount: 0
    }
  },
  created() {
@@ -122,7 +122,7 @@
        if (res.code === 200) {
          console.log(res)
          const list = res.data.map((item) => {
            item.adjustAmount=0
            item.adjustAmount = 0
            return {
              ...item,
              isSet: false,
@@ -140,9 +140,9 @@
    // 操作输入
    inputContent(val, prop, row) {
      console.log(val, prop, row)
      console.log(val-row.amount,"结果")
      this.adjustAmount=val-row.amount
      this.tableList.tableData[row.index].adjustAmount=this.adjustAmount   
      console.log(val - row.amount, "结果")
      this.adjustAmount = val - row.amount
      this.tableList.tableData[row.index].adjustAmount = this.adjustAmount
      // this.differenceAmount = val
    },
    // 新增
@@ -180,7 +180,7 @@
        let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
        requestUrl({
          // amount: this.amount,
          adjustAmount:this.adjustAmount,
          adjustAmount: this.adjustAmount,
          // differenceAmount: this.differenceAmount,
          locationId: this.locationId,
          operationId: this.operationId,
@@ -204,7 +204,7 @@
    // 是否选择产品
    isSel() {
      for (let i = 0; i < this.tableData.length; i++) {
        if (this.tableData[i].productName.length === 0) {
        if (this.tableData && this.tableData[i].productName.length === 0) {
          this.isNoProduct = false
          break
        } else {
@@ -268,7 +268,7 @@
    },
    // 行点击
    tableRowClick(row, rowIndex) {
      this.rowIndex=rowIndex
      this.rowIndex = rowIndex
      this.isSel()
      if (!this.isNoProduct && this.currentRowId === 0) {
        this.$message.error("请完成当前新建或取消新建")

 src/views/operate/scrap/AddScrapDialog.vue

@@ -212,7 +212,7 @@
    },
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title === "新建"||this.editConfig.title==="编辑") {
        this.showButton = false
        this.showEdit = false
        this.showFooter = true
@@ -224,7 +224,7 @@
        this.isValidateClick = false
      } else {
        this.showButton = true
        this.showEdit = true
        this.showEdit = false
        this.showFooter = false
        this.isValidateClick = true
      }

 src/views/operate/scrap/index.vue

@@ -16,22 +16,43 @@
          :table-list="tableList"
          :show-checkcol="false"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        >
          <template slot="tableButton">
            <el-table-column fixed="right" label="操作" width="100">
              <template slot-scope="scope">
                <el-button
                  @click="examineClick(scope.row)"
                  type="text"
                  size="small"
                  >查看</el-button
                >
                <el-button type="text" v-if="scope.row.status!=4" size="small" @click="editClick(scope.row)">编辑</el-button>
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
        <PagerView
          class="page"
          :pager-options="pagerOptions"
          v-on="pagerEvents"
        />
      </div>
    </div>
    <!-- 新建/编辑 -->
    <AddScrapDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
    <AddScrapDialog
      v-if="editConfig.visible"
      :editCommonConfig="editConfig"
    />
  </div>
</template>

<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getDisuseList } from "@/api/operate/scrap"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
import { getDisuseList } from "@/api/operate/scrap";
// import DetailProduct from "@/views/productManage/product/DetailProduct"
import AddScrapDialog from "@/views/operate/scrap/AddScrapDialog"
import AddScrapDialog from "@/views/operate/scrap/AddScrapDialog";

export default {
  name: "ScrapView",
@@ -46,16 +67,29 @@
      editConfig: {
        visible: false,
        title: "新建",
        infomation: {}
        infomation: {},
        showEdit:false,
      },
      keyword: ""
    }
      keyword: "",
    };
  },
  created() {
    this.setTable()
    this.getData()
    this.setTable();
    this.getData();
  },
  methods: {
    // 查看
    examineClick(row) {
      this.editConfig.title = "查看";
      this.editConfig.infomation = { ...row };
      this.editConfig.visible = true;
    },
    editClick(row){
      console.log(row,"编辑")
      this.editConfig.title = "编辑";
      this.editConfig.infomation = { ...row };
      this.editConfig.visible = true;
    },
    setTable() {
      this.tableList = {
        tableInfomation: [],
@@ -63,61 +97,61 @@
        selectIndex: true,
        showcol: this.showcol,
        allcol: [],
        tableColumn: this.setTableColumn(this.showcol)
      }
      let allcol = []
        tableColumn: this.setTableColumn(this.showcol),
      };
      let allcol = [];
      for (let i = 0; i < this.tableList.tableColumn.length; i++) {
        if (!this.tableList.tableColumn[i].default) {
          const label = this.tableList.tableColumn[i].label
          allcol.push(label)
          const label = this.tableList.tableColumn[i].label;
          allcol.push(label);
        }
      }
      this.tableList.allcol = allcol
      this.tableList.allcol = allcol;
    },
    setTableColumn(showcol) {
      console.log(showcol)
      console.log(showcol);
      let tableColumn = [
        {
          label: "单号",
          prop: "number",
          isShowColumn: true,
          default: true
          default: true,
        },
        {
          label: "日期",
          prop: "operationDate",
          isShowColumn: true,
          default: true
          default: true,
        },
        {
          label: "产品",
          prop: "productName",
          isShowColumn: true,
          default: true
          default: true,
        },
        {
          label: "数量",
          prop: "amount",
          isShowColumn: true,
          default: false
          default: false,
        },
        {
          label: "计量单位",
          prop: "unit",
          isShowColumn: true,
          default: false
          default: false,
        },
        {
          label: "源位置",
          prop: "from",
          isShowColumn: true,
          default: false
          default: false,
        },
        {
          label: "报废位置",
          prop: "to",
          isShowColumn: true,
          default: false
          default: false,
        },
        {
          label: "状态",
@@ -127,61 +161,61 @@
          default: false,
          status: true,
          isCallMethod: true,
          getCallMethod: this.getStatus
        }
      ]
      return tableColumn
          getCallMethod: this.getStatus,
        },
      ];
      return tableColumn;
    },
    selTableCol(val) {
      this.showcol = val
      this.tableList.tableColumn = this.setTableColumn(val)
      this.showcol = val;
      this.tableList.tableColumn = this.setTableColumn(val);
    },
    // 请求数据
    async getData() {
      await getDisuseList({
        number: this.keyword,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
        pageSize: this.pagerOptions.pageSize,
      }).then((res) => {
        if (res.code === 200) {
          const list = res.data.map((item) => {
            return {
              ...item,
              from: item.fromLocation.name,
              to: item.toLocation.name
            }
          })
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.total
              to: item.toLocation.name,
            };
          });
          this.tableList.tableInfomation = list || [];
          this.pagerOptions.totalCount = res.total;
        }
      })
      });
    },
    // 搜索
    getList(val) {
      this.keyword = val
      console.log(val)
      this.pagerOptions.currPage = 1
      this.getData()
      this.keyword = val;
      console.log(val);
      this.pagerOptions.currPage = 1;
      this.getData();
    },
    // 行点击
    tableRowClick(row) {
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
      this.editConfig.infomation = { ...row }
      console.log(row);
      // this.editConfig.visible = true;
      // this.editConfig.title = "编辑";
      this.editConfig.infomation = { ...row };
    },
    // 新建
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.infomation = {}
      this.editConfig.visible = true;
      this.editConfig.title = "新建";
      this.editConfig.infomation = {};
    },
    // 状态
    getStatus(val) {
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成"
    }
  }
}
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成";
    },
  },
};
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->

 src/views/overview/AddOverviewDialog.vue

@@ -46,7 +46,7 @@
            <el-row>
              <el-col :span="12">
                <el-form-item prop="companyName">
                  <span slot="label">{{ workType === 1 ? "客户" : workType === 2 ? "送货地址" : "联系人" }}</span>
                  <span slot="label">{{ workType === 1 ? "供应商" : workType === 2 ? "客户" : "联系人" }}</span>
                  <el-select
                    v-model="editConfig.infomation.companyName"
                    placeholder="请选择"

 src/views/overview/OverviewListView.vue

@@ -1,5 +1,8 @@
<template>
  <div class="rightContent">
    <div class="label-fixed-element">
      <span>{{ params.name }}</span>
    </div>
    <div class="top">
      <SearchCommonView
        :add-title="'新建'"
@@ -58,7 +61,7 @@
  data() {
    return {
      tableList: {},
      showcol: ["从", "至", "联系人", "日期", "来源单据", "状态"],
      showcol: ["仓库位置", "调出位置", "调入位置", "联系人", "日期", "来源单据", "状态"],
      searchOptions: [],
      commonDetail: {
        visible: false,
@@ -73,10 +76,14 @@
      workType: this.$route.params.workType,
      keyword: "",
      params: {},
      displayEdit: false
      displayEdit: false,
      formLabel: "",
      toLabel: ""
    }
  },
  created() {
    console.log(this.workType)
    this.setFormToLabel()
    this.setTable()
    var paramsData = sessionStorage.getItem("paramsData")
    let params = {}
@@ -95,6 +102,18 @@
    sessionStorage.removeItem("paramsData")
  },
  methods: {
    setFormToLabel() {
      if (this.workType === 1) {
        this.formLabel = "供应商位置"
        this.toLabel = "仓库位置"
      } else if (this.workType === 2) {
        this.formLabel = "仓库位置"
        this.toLabel = "客户位置"
      } else {
        this.formLabel = "调出位置"
        this.toLabel = "调入位置"
      }
    },
    setTable() {
      this.tableList = {
        tableInfomation: [],
@@ -122,15 +141,15 @@
          default: true
        },
        {
          label: "从",
          label: this.formLabel,
          prop: "from",
          isShowColumn: showcol.includes("从"),
          isShowColumn: showcol.includes(this.formLabel),
          default: false
        },
        {
          label: "至",
          label: this.toLabel,
          prop: "to",
          isShowColumn: showcol.includes("至"),
          isShowColumn: showcol.includes(this.toLabel),
          default: false
        },
        {
@@ -258,4 +277,18 @@
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped></style>
<style lang="scss" scoped>
.label-fixed-element {
  background: #e6ecf2;
  position: fixed;
  font-size: 14px;
  width: calc(100% - 530px);
  height: 45px;
  line-height: 45px;
  font-size: 18px;
  font-weight: 700;
  color: #171718;
  margin-top: -60px;
  margin-left: -5px;
}
</style>

 src/views/overview/index.vue

@@ -41,7 +41,7 @@
        </div>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
        <PagerView class="page" :page-sizes="pageSizes" :pager-options="pagerOptions" v-on="pagerEvents" />
      </div>
    </div>
  </div>
@@ -65,10 +65,12 @@
        title: "新建",
        infomation: {},
        keyword: ""
      }
      },
      pageSizes: [30, 45]
    }
  },
  created() {
    this.pagerOptions.pageSize = 30
    this.getData()
  },
  methods: {

 src/views/productManage/product/AddProductDialog.vue

@@ -1,14 +1,14 @@
<template>
  <div class="add-common">
    <el-dialog
      :title="editCommonConfig.title + '产品'"
      :title="modalTitle + '产品'"
      :visible.sync="editConfig.visible"
      :width="dialogWidth"
      :before-close="handleClose"
    >
      <!-- 头 -->
      <div slot="title" class="dialog-header">
        <span>{{ editCommonConfig.title + "产品" }}</span>
        <span>{{ modalTitle + "产品" }}</span>
        <div class="header_btns">
          <span class="btn">
            <i class="el-icon-printer"></i>
@@ -165,7 +165,7 @@
                      :disabled="!showFooter"
                    >
                      <el-option
                        v-for="item in productCategoryOptions"
                        v-for="item in productCategoryListWithDefault"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id"
@@ -474,13 +474,27 @@
        return {
          visible: false,
          title: "新建",
          infomation: {}
          infomation: {},
          autoEdit:false
        }
      }
    }
  },
  components: {},
  computed: {},
  computed: {
    productCategoryListWithDefault(){
      return [{id:0,name:'请选择'},...(this.productCategoryOptions ?? [])]
    },
    modalTitle(){
      if (this.editConfig.title === '编辑' && this.editConfig.autoEdit){
        return '编辑'
      }else if (this.editConfig.title === '编辑') {
        return !this.showEdit ? '编辑' : '查看'
      }else {
        return '新建'
      }
    }
  },
  data() {
    return {
      dialogWidth: "50%",
@@ -494,6 +508,7 @@
      memberOptions: [{ name: "管理员", id: 1 }],
      productCategoryOptions: [], // 产品类别
      productTypeOptions: [
        { name: "请选择", id: 0 },
        { name: "能消耗", id: 1 },
        { name: "服务", id: 2 },
        { name: "可库存产品", id: 3 }
@@ -538,6 +553,9 @@
    this.setTableForm()
    this.setBottonView()
    this.statisticsMap.inLibrary = this.editConfig?.infomation?.amount ?? 0
    if (this.editConfig.autoEdit){
      this.editClick()
    }
  },
  methods: {
    // 获取产品类别

 src/views/productManage/product/index.vue

@@ -29,7 +29,7 @@
      </div>
      <!-- 图表形式 -->
      <div v-if="isIconIndex === '1'" class="product-view">
        <div class="product-box" v-for="item in tableList.tableInfomation" :key="item.id" @click="tableRowClick(item)">
        <div class="product-box" v-for="item in tableList.tableInfomation" :key="item.id" @click="showDetail(item)">
          <div class="left">
            <!-- <el-image style="width: 60px; height: 80px" :src="url"></el-image> -->
            <div class="img-view">
@@ -58,12 +58,20 @@
          ref="tableListRef"
          :table-list="tableList"
          @selTableCol="selTableCol"
          @tableRowClick="tableRowClick"
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="90" align="center">
              <template slot-scope="scope">
                <span @click.stop="showDetail(scope.row)" class="cursor_pointer" style="margin-right: 10px">
                  <span style="color: #2a78fb">查看</span>
                </span>
                <span @click.stop="editRow(scope.row)" class="cursor_pointer">
                  <span style="color: #2a78fb">编辑</span>
                </span>
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
        <!-- <div class="btn-pager">
          <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
        </div> -->
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" :page-size="pageSizes" v-on="pagerEvents" />
@@ -99,7 +107,8 @@
      editConfig: {
        visible: false,
        title: "新建",
        infomation: {}
        infomation: {},
        autoEdit: false
      },
      isIconIndex: "2", // 1 图标 2 列表
      url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
@@ -254,13 +263,21 @@
      this.editConfig.title = "新建"
      this.editConfig.infomation = {}
    },
    // 行点击
    tableRowClick(row) {
    // 详情
    showDetail(row) {
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.autoEdit = false
      this.editConfig.title = "编辑"
      this.editConfig.infomation = { ...row }
    },
    // 编辑
    editRow(row){
      this.editConfig.autoEdit = true
      this.editConfig.title = "编辑"
      this.editConfig.infomation = { ...row }
      this.editConfig.visible = true
    },
    // 切换列表展现形式
    selIconSwitchClick(value) {
      this.pagerOptions.currPage = 1

 src/views/productManage/productCategory/AddProductCategoryDialog.vue

@@ -1,14 +1,14 @@
<template>
  <div class="add-common">
    <el-dialog
      :title="editCommonConfig.title + '产品类别'"
      :title="modalTitle + '产品类别'"
      :visible.sync="editConfig.visible"
      :width="dialogWidth"
      :before-close="handleClose"
    >
      <!-- 头 -->
      <div slot="title" class="dialog-header">
        <span>{{ editCommonConfig.title + "产品类别" }}</span>
        <span>{{ modalTitle + "产品类别" }}</span>
        <div class="header_btns">
          <!-- <span class="btn">
            <i class="el-icon-printer"></i>
@@ -183,7 +183,8 @@
        return {
          visible: false,
          title: "新建",
          infomation: { type: [] }
          infomation: { type: [] },
          autoEdit: false,
        }
      }
    },
@@ -197,8 +198,16 @@
  components: {},
  computed: {
    productCategoryListWithDefault(){
      console.log(this.productCategoryList)
      return [{id:0,name:'请选择'},...(this.productCategoryList?? [])]
    },
    modalTitle(){
      if (this.editConfig.title === '编辑' && this.editConfig.autoEdit){
        return '编辑'
      }else if (this.editConfig.title === '编辑') {
        return !this.showEdit ? '编辑' : '查看'
      }else {
        return '新建'
      }
    }
  },
  data() {
@@ -227,6 +236,9 @@
  created() {
    this.setBottonView()
    this.getProductCount()
    if (this.editConfig.autoEdit){
      this.editClick()
    }
  },
  methods: {
    // 获取产品数量

 src/views/productManage/productCategory/index.vue

@@ -15,8 +15,20 @@
          ref="tableListRef"
          :table-list="tableList"
          :show-checkcol="false"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="90" align="center">
              <template slot-scope="scope">
                <span @click.stop="showDetail(scope.row)" class="cursor_pointer" style="margin-right: 10px">
                  <span style="color: #2a78fb">查看</span>
                </span>
                <span @click.stop="editRow(scope.row)" class="cursor_pointer">
                  <span style="color: #2a78fb">编辑</span>
                </span>
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -45,7 +57,8 @@
      editConfig: {
        visible: false,
        title: "新建",
        infomation: {}
        infomation: {},
        autoEdit: false
      }
    }
  },
@@ -93,8 +106,16 @@
      this.pagerOptions.currPage=1
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
    // 查看
    showDetail(row) {
      this.editConfig.autoEdit = false
      this.editConfig.title = "编辑"
      this.editConfig.infomation = { ...row }
      this.editConfig.visible = true
    },
    // 编辑
    editRow(row){
      this.editConfig.autoEdit = true
      this.editConfig.title = "编辑"
      this.editConfig.infomation = { ...row }
      this.editConfig.visible = true

 src/views/reportForm/inventoryReport/index.vue

@@ -217,42 +217,48 @@
          label: "单位成本",
          prop: "cost",
          default: false,
          isShowColumn: showcol.includes("单位成本")
          isShowColumn: showcol.includes("单位成本"),
          textAlign:"left"
        },
        {
          label: "总价值",
          prop: "value",
          default: false,
          isShowColumn: showcol.includes("总价值"),
          unit: "￥"
          unit: "￥",
          textAlign:"left"
        },
        {
          label: "在库",
          prop: "amount",
          default: true,
          isShowColumn: true,
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "可用库存",
          prop: "availableNumber",
          default: true,
          isShowColumn: true,
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "入库",
          prop: "in",
          default: false,
          isShowColumn: showcol.includes("入库"),
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "出库",
          prop: "out",
          isShowColumn: showcol.includes("出库"),
          default: false,
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "预测",
@@ -419,4 +425,5 @@
    flex: 1;
  }
}

</style>

 src/views/reportForm/locationReport/index.vue

@@ -165,14 +165,16 @@
          prop: "amount",
          isShowColumn: true,
          default: true,
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "预留数量",
          prop: "availableStore",
          isShowColumn: true,
          default: true,
          unit: ""
          unit: "",
          textAlign:"left"
        },
        {
          label: "单位",
@@ -187,6 +189,7 @@
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
          textAlign:"left",
          unit: "￥"
        }
      ]
@@ -266,4 +269,5 @@
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped></style>
<style lang="scss" scoped>
</style>