zuozhengqing
2023-11-24 6208d26b43f7a87027e42651c4e4d8836f9f9b8b
add:出入库添加物流信息/报表添加详情及打印
5个文件已修改
99 ■■■■■ 已修改文件
src/api/reportForm/inventoryRwport.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/AddOverviewDialog.vue 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/OverviewListView.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportForm/inboundOutboundDetail/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportForm/outboundDetail/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/reportForm/inventoryRwport.js
@@ -36,4 +36,12 @@
    method: "post",
    data
  })
}
//查询单条详情接口
export function getOperationInfo(data) {
  return request({
    url: `/api-wms/v1/operation/getOperationInfo/${data}`,
    method: "get",
    data
  })
}
src/views/overview/AddOverviewDialog.vue
@@ -265,7 +265,7 @@
            <el-tabs v-model="activeName" type="card">
              <!-- <el-tab-pane v-if="workType !== 1" label="详情" name="detail"> </el-tab-pane> -->
              <el-tab-pane label="产品" name="first"> </el-tab-pane>
              <el-tab-pane label="发货信息" name="two"></el-tab-pane>
              <el-tab-pane label="物流信息" name="two" v-if="this.workType===2"></el-tab-pane>
            </el-tabs>
            <!-- 操作 -->
            <div v-if="activeName === 'first'">
@@ -286,28 +286,51 @@
                </template>
              </CommonFormTableView>
            </div>
            <!-- 发货信息 -->
            <div v-if="activeName==='two'">
            <!-- 物流信息 -->
            <div v-if="activeName==='two'&&this.workType===2">
              <el-form label-position="left" label-width="80px" :model="shipmentsInfo">
                <el-form-item label="承运商"  style="width: 50%;">
                  <el-select :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="请选择" style="width: 100%;">
                    <el-option
                      v-for="item in shipmentsInfo.carrier"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
                <el-form-item label="运单号" style="width: 50%;">
                  <el-input :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
                </el-form-item>
                <el-form-item label="重量" style="width: 50%;">
                  <el-input :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
                </el-form-item>
                <el-form-item label="物流重量" style="width: 50%;">
                  <el-input :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
                </el-form-item>
                <el-col :span="12">
                  <el-form-item label="承运商" style="width: 80%;" >
                    <el-select :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="请选择" style="width: 100%;">
                      <el-option
                        v-for="item in shipmentsInfo.carrier"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id">
                      </el-option>
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="运单号" style="width: 80%;">
                    <el-input :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="收货人" style="width: 80%;">
                    <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverName"></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="联系电话" style="width: 80%;">
                    <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverPhone"></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="收货地址" style="width: 80%;">
                    <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverAddr"></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="重量" style="width: 80%;">
                    <el-input :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="物流重量" style="width: 80%;">
                    <el-input :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
                  </el-form-item>
                </el-col>
              </el-form>
            </div>
            <!-- 详情 -->
@@ -672,6 +695,9 @@
        weight:data.weight||0,
        logisticWeight:data.logisticWeight||0,
        logisticCompanyId:data.logisticCompanyId,
        receiverAddr:data.receiverAddr||'',
        receiverName:data.receiverName||'',
        receiverPhone:data.receiverPhone||''
      }
      return params
    },
src/views/overview/OverviewListView.vue
@@ -40,7 +40,7 @@
    <!-- 新建/编辑 -->
    <AddOverviewDialog
      v-if="editConfig.visible"
      :work-type="workType"
      :workType="workType"
      :edit-common-config="editConfig"
      :add-name="addName"
      :display-edit="displayEdit"
@@ -87,7 +87,6 @@
    }
  },
  created() {
    console.log(this.workType)
    this.setFormToLabel()
    this.setTable()
    var paramsData = sessionStorage.getItem("paramsData")
@@ -263,7 +262,6 @@
    },
    // 查看 编辑
    tableRowClick(row, val) {
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = val
      this.editConfig.operationTypeId = this.params.id
src/views/reportForm/inboundOutboundDetail/index.vue
@@ -34,7 +34,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getHistory } from "@/api/reportForm/inventoryRwport"
import { getHistory,getOperationInfo } from "@/api/reportForm/inventoryRwport"
// import { getProductOperatonList } from "@/api/product/product"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
@@ -249,10 +249,12 @@
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
    async tableRowClick(row) {
      await getOperationInfo(row.operationId).then((res)=>{
        this.editConfig.infomation = { ...res.data }
      })
      this.editConfig.visible = true
      this.editConfig.title = "查看"
      this.editConfig.infomation = { ...row }
    },
    // 新建
    addBtnClick() {
src/views/reportForm/outboundDetail/index.vue
@@ -20,7 +20,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getHistory } from "@/api/reportForm/inventoryRwport"
import { getHistory,getOperationInfo } from "@/api/reportForm/inventoryRwport"
// import { getProductOperatonList } from "@/api/product/product"
import AddOverviewDialog from "@/views/reportForm/outboundDetail/AddOutboundDetailDialog.vue"
@@ -234,11 +234,12 @@
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
      console.log(row, "看看row")
    async tableRowClick(row) {
      await getOperationInfo(row.operationId).then((res)=>{
        this.editConfig.infomation = { ...res.data }
      })
      this.editConfig.visible = true
      this.editConfig.title = "查看"
      this.editConfig.infomation = { ...row }
    },
    // 新建
    addBtnClick() {