20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化

黎星凯

2024-05-08 b4adff68a07b783fc90da1c9370d8be5f383e700

 admin-web/src/views/stock/transfer/transferApplication/index.vue

@@ -1,457 +1,325 @@
<template>
  <div class="app-container">
  <div class="app-container stock-container">
    <el-container>
      <el-container>
        <el-card class="box-card" style="width: 100%" shadow="never">
          <!--搜索条件-->
          <div class="filter-container">
            <my-search ref="searchBar" :items="items" @search="fifterForm"></my-search>
          </div>
          <el-row style="margin-top: 15px">
            <el-col>
              <!--列表-->
              <my-button name="新增" @click="addtable" site="form" />
              <div :style="{'overflow-y': 'auto', height:`${clientHeight - 320}px`}">
                    <el-row class="card"
                            :gutter="5">
                        <el-col v-for="(item, index) in proData" :key="index" class="cm-item">
                          <el-card class="card-data">
                            <div class="card-container">
                              <div class="hed-one"> <span>调拨单号：{{ item.order_no }}</span><span style="margin-left: 20px;"><el-button type="warning" plain size="mini">待接收</el-button></span></div>
                              <div class="one-hed">
                                <div class="box"><span class="span-two">接受机构：</span>{{ item.customer_name }}</div>
                                <div class="box"><span class="span-two">申请人：</span>{{ item.customer_name }}</div>
                                <div class="box"><span class="span-two">申请调拨时间：</span>{{ item.customer_name }}</div>
                                <div class="box"><span class="span-two">接收时间：</span>{{ item.customer_name }}</div>
                                <div class="box"><span class="span-two">调拨时间：</span>{{ item.customer_name }}</div>
                                <div class="box"><span class="span-two">接受人：</span>{{ item.customer_name }}</div>
                                <div class="box"><span class="span-two">接受时间：</span>{{ item.customer_name }}</div>
                              </div>
                              <div class="card-end">
                                <div v-for="(just, index) in item.data" class="two-end">
                                  <div class="item"><span>{{ just.order_no }}：</span>{{ just.customer_name }}</div>
                                </div>
                              </div>
                            </div>
                            <div class="card-but">
                              <div  style="margin-top: 10px;">
                                <my-button style="width: 120px;" name="删除"   site="form" />
                                <my-button style="width: 120px;" name="查看详情" site="form" />
                              </div>
                            </div>
                            
                          </el-card>
                        </el-col>
                    </el-row>
              </div>
              <el-pagination
                :small="false"
                :current-page="1"
                :page-sizes="[5, 10, 20, 50, 100, 200, 300, 400, 500]"
                :page-size="10"
                layout="total, sizes, prev, pager, next, jumper"
                :total="0"
                @size-change="handleSizeChange"
                @current-change="handleCurrentChange"
              />
            </el-col>
          </el-row>
          <!--添加/编辑弹窗-->
          <el-dialog title="新增出库"  :close-on-click-modal="false" :visible.sync="adddialog" width="60%" >
            <el-form ref="ruleForm" :model="formData" class="demo-ruleForm" label-width="100px">
              <el-row :gutter="24" class="headerHeight">
                  <el-col :span="12">
                    <el-form-item label="仓库名称" prop="name">
                      <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
                    </el-form-item>
                  </el-col>
                  <el-col :span="12">
                    <el-form-item label="仓库名称" prop="name">
                      <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
                    </el-form-item>
                  </el-col>
                </el-row>
                <el-row :gutter="24" class="headerHeight">
                  <el-col :span="24">
                    <el-form-item label="出库手续" prop="name">                      
                      仅允许导入xls、xlsx格式文件
                    </el-form-item>
                  </el-col>
                </el-row>
                <div style="position: relative;">
                  <div style="background-color: #F9F9F9;width: 90%;">
                  <el-row :gutter="24" class="">
                    <el-col :span="12">
                      <el-form-item label="仓库名称" prop="name">
                        <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
                      </el-form-item>
                    </el-col>
                    <el-col :span="12">
                      <el-form-item label="仓库名称" prop="name">
                        <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
                      </el-form-item>
                    </el-col>
                  </el-row>
                  <el-row :gutter="24" class="">
                    <el-col :span="12">
                      <el-form-item label="仓库名称" prop="name">
                        <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
                      </el-form-item>
                    </el-col>
                  </el-row>
                  <el-table :data="formData.tableData" height="100%"  :stripe="true">
                    <el-table-column prop="projectName" label="规格型号" align="center"> </el-table-column>
                    <el-table-column prop="time1" label="单位"  align="center"> </el-table-column>
                    <el-table-column prop="unit" label="现有库存" align="center"> </el-table-column>
                    <el-table-column prop="time2" label="出库数量"  align="center"> </el-table-column>
                  </el-table>
                  </div>
                  <div style="position: absolute;right: 0;top: 152px;">
                    <my-button style="display: block;margin-left: 10px;margin-bottom: 5px;" name="移除" site="form"/>
                    <my-button name="新增物品" site="form"/>
                  </div>
                </div>
            </el-form>
            <div slot="footer" align="center" class="dialog-footer">
              <my-button name="确定" site="form" />
              <my-button name="取消" site="form" @click="adddialog = false"/>
      <el-card class="box-card" style="width: 100%" shadow="never">
        <!--搜索条件-->
        <div class="filter-container">
          <my-search ref="searchBar" :items="items" @search="fifterForm"></my-search>
        </div>
        <el-row style="margin-top: 15px">
          <el-col>
            <!--列表-->
            <div class="table-tool-bar" style="margin-bottom: 15px">
              <my-button name="调拨申请" icon="el-icon-plus" @click="handleAdd" site="tools" size="medium" />
            </div>
          </el-dialog>
        </el-card>
      </el-container>
            <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }" v-loading="loading">
              <el-row v-if="list.length" class="card" :gutter="5">
                <el-col v-for="(item, index) in list" :key="index" class="cm-item">
                  <el-card class="card-data">
                    <div class="card-container">
                      <div class="card-header">
                        <div class="card-header-left">
                          <span>调拨单号：</span>
                          <span class="value">{{ item.businessFormCode }}</span>
                          <div v-if="item.states == 0 && item.procureDoc !=null" class="states states-warning">待出库</div>
                          <div v-if="item.states == 0 && item.procureDoc ==null" class="states states-warning">待提交</div>
                          <div v-if="item.states == 1" class="states states-warning">待接收</div>
                          <div v-if="item.states == 2" class="states states-success">已接收</div>
                          <div v-if="item.states == 4" class="states states-info">已撤销</div>
                        </div>
                        <div class="card-header-right">
                          <el-button
                            v-if="item.states == 1"
                            site="form"
                            type="success"
                            size="mini"
                            @click="handleIncome(item)"
                            >入库</el-button
                          >

                          <el-button v-if="item.states == 0 && item.procureDoc ==null" site="form" type="primary" size="mini"
                                     @click="handleExport('transferExport',`调拨单-${item.businessFormCode}`, {id:item.id,type:0})"
                          >下载
                          </el-button
                          >

                          <el-button
                            v-if="item.states == 0 && item.procureDoc ==null"
                            site="form"
                            type="primary"
                            size="mini"
                            @click="handleUploadPage(item)"
                          >上传</el-button
                          >

                          <el-button
                            v-if="item.states == 0"
                            site="form"
                            type="danger"
                            size="mini"
                            @click="handleRevoke(item)"
                            >撤销</el-button
                          >
                          <el-button
                            v-if="item.states == 2"
                            site="form"
                            type="primary"
                            size="mini"
                            @click="handleExport('transferExport',`调拨入库单-${item.businessFormCode}`,{id:item.id,type: 1})"
                            >导出调拨入库单</el-button
                          >
                          <el-button name="查看详情" site="form" type="info" size="mini" @click="handleDetail(item)"
                            >查看详情</el-button
                          >
                        </div>
                      </div>
                      <div class="one-hed">
                        <div class="box"><span class="span-two">接收机构：</span>{{ item.inAgencyName }}</div>
                        <div class="box"><span class="span-two">申请人：</span>{{ item.operatorName }}</div>
                        <div class="box">
                          <span class="span-two">申请调拨时间：</span>{{ item.createTime | formatTime }}
                        </div>
                        <div class="box"><span class="span-two">接收时间：</span>{{ item.inTime | formatTime }}</div>
                      </div>
                      <div class="one-hed">
                        <div class="box"><span class="span-two">调拨机构：</span>{{ item.outAgencyName }}</div>
                        <div class="box"><span class="span-two">调拨人：</span>{{ item.outOperatorName }}</div>
                        <div class="box">
                          <span class="span-two">调拨时间：</span>{{ item.outputTime | formatTime }}
                        </div>
                      </div>
                      <div class="card-end">
                        <div v-for="(just, index) in item.fromTransferTemplateInfoList" :key="index" class="item">
                          <div class="name">{{ just.goodsName }}</div>
                          <div class="value-box">
                            <div class="value-box-item">
                              <span class="label">数量：</span>
                              <span class="value">{{ just.count }}</span>
                              <span class="unit">{{ just.unit }}</span>
                            </div>
                          </div>
                        </div>
                      </div>
                    </div>
                  </el-card>
                </el-col>
              </el-row>
              <el-empty v-else description="暂无数据"></el-empty>
            </div>
            <el-pagination
              :small="false"
              :current-page="pageNum"
              :page-sizes="[5, 10, 20, 50, 100, 200, 300, 400, 500]"
              :page-size="pageSize"
              layout="total, sizes, prev, pager, next, jumper"
              :total="total"
              @size-change="handleSizeChange"
              @current-change="handleCurrentChange"
            />
          </el-col>
        </el-row>
      </el-card>
    </el-container>
    <my-import
      :import-setting="importSetting"
      :dialog-show="importSetting.dialogShow"
      :dialog-title="importSetting.dialogTitle"
    />

    <!-- 上传分发单文件-->
    <uploadPage
      v-if="uploadPageSetting.show"
      :setting="uploadPageSetting"
      ref="uploadRef"
      @close="uploadPageSetting.show = false"
      @search="refreshData"
    ></uploadPage>

    <!--添加/编辑弹窗-->
    <edit
      v-if="editSetting.show"
      :setting="editSetting"
      ref="editRef"
      @close="editSetting.show = false"
      @search="refreshData"
    ></edit>
    <detail
      v-if="detailSetting.show"
      :setting="detailSetting"
      @close="detailSetting.show = false"
      ref="detailRef"
    ></detail>
  </div>
</template>

<script>
import MyButton from "@/components/myButton/myButton";
import {transfeIncome, transferList, transferUpdStatus} from '@/api/stock/transfer';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import listPage from '@/views/mixins/listPage';
import transfer from '@/views/mixins/transfer';
import SettingIplatform from '@/utils/settingIplatform';
import myImport from '@/views/components/myImport'
import {getBaseUrl} from '@/utils/base';
import uploadPage from './uploadPage';
import * as dataExport from "@/api/exportExcel";
import {downLoad} from "@/utils/base";

export default {
  name: "index",
  components: {MyButton, myImport},
  name: 'index',
  mixins: [listPage, transfer],
  components: { MyButton, myImport, edit, detail,uploadPage },
  data() {
    return {
      
      adddialog: false,
      formData:{
        tableData:[
          {
            projectName:'555'
          },
          {
            projectName:'444'
          }
        ],
      },
      loading: false,
      list: [],
      // 搜索框
      items: [
        {
          type: 'text',
          dataIndex: 'name',
          label: '出库单号',
          dataIndex: 'businessFormCode',
          label: '调拨单号',
          placeholder: '请输入',
          defaultValue: ''
          defaultValue: '',
        },
        {
          type: 'text',
          dataIndex: 'name',
          type: 'select',
          dataIndex: 'goodsTemplateId',
          label: '物品名称',
          placeholder: '可模糊搜索',
          defaultValue: ''
        },
        {
          type: 'text',
          dataIndex: 'name',
          label: '创建人',
          placeholder: '请输入',
          defaultValue: ''
          defaultValue: '',
          options: [],
          optionsConfig: {
            label: 'goodsName',
            value: 'id',
            url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
          },
        },
        {
          type: 'select',
          dataIndex: 'states',
          label: '状态',
          placeholder: '请选择',
          defaultValue: '',
          options: [],
        },
        {
          type: 'date-picker',
          dataIndex: 'val1',
          label: '出库时间',
          defaultValue: ''
          dataIndex: 'createTimeStart',
          label: '申请时间',
          defaultValue: '',
        },
        {
          type: 'date-picker',
          dataIndex: 'val2',
          dataIndex: 'createTimeEnd',
          label: '至',
          defaultValue: ''
          defaultValue: '',
        },
        // {
        //   type: 'select',
        //   dataIndex: 'status',
        //   label: '状态',
        //   placeholder: '请选择',
        //   defaultValue: '1',
        //   options: [
        //     {
        //       label: '启用',
        //       value: '1'
        //     },
        //     {
        //       label: '禁用',
        //       value: '0'
        //     }
        //   ]
        // }
        {
          type: 'date-picker',
          dataIndex: 'startTime',
          label: '接收时间',
          defaultValue: '',
        },
        {
          type: 'date-picker',
          dataIndex: 'endTime',
          label: '至',
          defaultValue: '',
        },
      ],
      proData: [
        {
          order_no:'55555',
          customer_name:'郑州市邮政分公司',
          data:[
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'20件'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
          ]
        },
        {
          order_no:'55555',
          customer_name:'郑州市邮政分公司',
          data:[
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'郑州市邮政分公司'
            },
          ]
        },
        {
          order_no:'55555',
          customer_name:'郑州市邮政分公司',
          data:[
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'20件'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
          ]
        },
        {
          order_no:'55555',
          customer_name:'郑州市邮政分公司',
          data:[
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'20件'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
          ]
          
        },
        {
          order_no:'55555',
          customer_name:'郑州市邮政分公司',
          data:[
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'20件'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
          ]
          
        },
        {
          order_no:'55555',
          customer_name:'郑州市邮政分公司',
          data:[
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'20件'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
          ]
          
        },
        {
          order_no:'55555',
          customer_name:'郑州市邮政分公司',
          data:[
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'20件'
            },
            {
              order_no:'石勒芬褐色碳粉',
              customer_name:'666'
            },
          ]
          
        }
      ],
      // 树数据
      treeDataList: [],
      // 搜索条件
      filterFrom: {
        tenantId: null,
        userName: null,
        userPhone: null,
        status: 1
      },
      // 导入
      importSetting: {
          dialogTitle: '导入',
          dialogShow: false,
          fileSettings: {
              data: {},
              uploadUrl: getBaseUrl()+"/pc/fin/sys/tenant/import", // 上传地址
              accept: '.xls', // 格式
              type: 'text', // 回显形式
              loading: false // 导入效果
          },
          /* 模板下载 */
          templateSettings: {
              templateName: '导入模板.xls', // 名称
              templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 下载地址
          },
          onSuccess: null
      },
      editSetting: {
        title: '',
        id: '',
        orgId: '',
        show: false,
      },
    }
  },
  computed: {
    clientHeight () {
      return document.documentElement.clientHeight
    },
      filterFrom: {},
    };
  },
  created() {
    this.filterFrom = {
      inAgencyId: this.userInfo.tenantId,
    };
    this.fetchData();
    this.items.map((v) => {
      if (v.label == '状态') {
        v.options = this.statesOptions;
      }
      return v;
    });
  },
  methods: {
    handleSizeChange(){},
    handleCurrentChange(){},
    //导入
    importOrg() {
        this.importSetting.dialogShow = true
        this.importSetting.onSuccess = (response, callBack) => {
            if (response.code===1){
              this.$message.success(response.msg)
              this.search(1)
            }else{
              this.$message.warning(response.msg)
            }
            callBack()
        }
    fetchData() {
      this.loading = true;
      transferList({
        pageNum: this.pageNum,
        pageSize: this.pageSize,
        ...this.filterFrom,
      }).then((res) => {
        this.list = res.datas;
        this.total = res.totalRows;
        this.loading = false;
      });
    },
   
    addtable() {
      this.adddialog = true

    // 入库
    handleIncome(row) {
      this.$confirm(`您确定 单号：${row.businessFormCode}  接收入库吗?`, '接收入库', {
        beforeClose: (action, instance, done) => {
          if (action == 'confirm') {
            instance.confirmButtonLoading = true;
            instance.confirmButtonText = '执行中...';
            transfeIncome({ id: row.id })
              .then((res) => {
                this.$message.success('接收入库成功！');
                done();
                instance.confirmButtonLoading = false;
                this.search(1);
              })
              .catch(() => {
                done();
              });
          } else {
            done();
          }
        },
      });
    },
    // 查询table列表
    search(pageNum) {
      if (pageNum != undefined) {
        // this.$refs.myTable.search(pageNum)
      } else {
        // this.$refs.myTable.search()
      }

    // 撤销
    handleRevoke(row) {
      this.$confirm(`您确定撤销单号为"${row.businessFormCode}"  的数据吗?`, '撤销').then(() => {
        transferUpdStatus({ id: row.id }).then((res) => {
          this.$message.success('撤销成功！');
          this.search(1);
        });
      });
    },
    fifterForm(params) {
      console.log(params,'555');
      this.filterFrom = Object.assign(this.filterFrom, params)
      this.search(1)
    }
  }
}
    // 导入
    handleUploadPage(row) {
      this.uploadPageSetting.id = row.id;
      this.uploadPageSetting.title = '导入';
      this.uploadPageSetting.show = true;
    },
    /**
     * 导出调拨入库单
     * @param api
     * @param fileName
     * @param params
     */
    handleExport(api, fileName, params) {
      let loading = this.$loading({
        lock: true,
        text: '导出中，请稍候...',
        spinner: 'el-icon-loading',
        background: 'rgba(0, 0, 0, 0.7)',
      });
      // 判断总条数是否大于最大支持条数
      dataExport[api](params)
        .then((res) => {
          console.log(res)
          downLoad(res)
          this.$message.success('导出成功！');
          loading.close();
        })
        .catch(() => {
          loading.close();
        });
    },
  },
};
</script>

<style scoped>
.card {
    display: flex;
    flex-wrap: wrap;
    margin: 0px !important;
    .cm-item {
        width: 100%;
    }
    .cm-item /deep/ .el-card__body {
        padding: 10px;
    }
}
.card-data{
  position: relative;
  margin-top: 8px;
  .card-container{
    display: inline-block; 
    width: 70%;
    .hed-one{
      color: #2298EE;
      font-size: 18px;
    }
    .one-hed{
      margin-top: 5px;
      .box{
        display: inline-block;  
        margin-right: 20px;  
        margin-top: 10px;
      }
    }
    .span-two{
      color: #83919e;
      font-size: 14px;
    }
    .card-end{
      font-size: 14px;
      color: #3d3d3d;
      margin-top: 15px;
      display: flex;  
      flex-wrap: wrap; 
      .two-end{
        width: calc(33.33% - 20px); 
        margin-bottom: 15px; 
      }
    }
    
  }
  .card-but{
    position: absolute;
    right: 20px;
    top: 40%;
  }
  
}

<style scoped lang="scss">
@import url(../../index.scss);
</style>