石广澎
2023-11-28 9bb18084093bdc0dabb614420d09e54c710d9b46
feat: 出入库明细对接

页面优化
25个文件已删除
15个文件已修改
3449 ■■■■■ 已修改文件
admin-web/public/index.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/public/static/config.js 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/components/mySearch/SearchItem.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/utils/settingIplatform.js 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/utils/stockType.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemdis/distribution/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemret/returnNote/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemscr/scrapping/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/detail.vue 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/edit.vue 143 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/index.vue 210 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/items.js 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/nodeChoose/edit.vue 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/nodeChoose/index.vue 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/nodeChoose/items.js 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/nodeChoose/nodeCycle.vue 215 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/nodeChoose/preview.vue 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/buildPlan/nodeChoose/stageNode.vue 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/kanbanConfig/edit.vue 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/kanbanConfig/index.vue 166 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/kanbanConfig/items.js 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/kanbanConfig/nodeChoose.vue 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/stageConfig/edit.vue 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/stageConfig/index.vue 191 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/stageConfig/items.js 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/stageConfig/node/edit.vue 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/stageConfig/node/items.js 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/stageConfig/node/node.vue 192 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/warningConfig/chooseItems.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/warningConfig/chooseUser.vue 206 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/warningConfig/edit.vue 330 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/warningConfig/index.vue 209 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/projectConfig/warningConfig/items.js 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/accessStock/outbound/index.vue 71 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/accessStock/outboundDetails/index.vue 86 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/procure/purchaseOrder/edit.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/procure/purchaseOrder/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/scrap/itemScrapping/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/transfer/transferApplication/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/transfer/transferissue/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/public/index.html
@@ -11,11 +11,10 @@
    <title><%= webpackConfig.name %></title>
  </head>
  <body>
    <script type="text/javascript" src="<%= BASE_URL %>static/config.js"></script>
    <script src="<%= BASE_URL %>static/tinymce4.7.5/tinymce.min.js"></script>
    <script src="<%= BASE_URL %>static/js/jquery.min.js"></script>
    <script src="<%= BASE_URL %>static/js/reconnecting-websocket.js"></script>
    <script src="<%= BASE_URL %>static/js/niuniucapture.js"></script>
    <script src="<%= BASE_URL %>static/js/capturewrapper.js"></script>
    <script  src="https://map.qq.com/api/gljs?v=1.exp&key=PGNBZ-XZ7C3-MPE34-OF2VP-7MRH6-BOFUG"></script>
    <div id="app"></div>
    <!-- built files will be auto injected -->
admin-web/public/static/config.js
@@ -1,25 +1,12 @@
// 请求接口地址 如果没有配置自动获取当前网址路径
const VUE_APP_API_URL = process.env.VUE_APP_BASE_API || `${location.origin}`;
const VUE_APP_WS_URL =
  process.env.VUE_APP_WS_URL || (location.protocol === 'https' ? 'wss' : 'ws') + ':' + location.hostname;
const SettingIplatform = {
  // 服务器地址
  // 服务器地址
  httpUrl: VUE_APP_API_URL,
  // 上传路径
  ftpUrl: 'https://yqzx.jinmingyuan.com/lowConsum',//开发
  // ftpUrl:'https://jmy.jinmingyuan.com/progress',// 测试,
// 接口请求地址
// apiBaseURL: 'http://116.198.39.83:8082/progress', // 正式
  // apiBaseURL: 'http://172.16.60.90:8082/progress',//开发
  // 接口请求地址
  apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//开发
  // apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//开发
// apiBaseURL: 'https://jmy.jinmingyuan.com/progress',// 测试,
  // socket连接
  wsSocketUrl: VUE_APP_WS_URL,
  debug: true //调试开关  true时会输出请求日志
  debug: false //调试开关  true时会输出请求日志
};
export default SettingIplatform;
admin-web/src/components/mySearch/SearchItem.vue
@@ -4,7 +4,7 @@
    <el-input
      :type="item.inputType || 'text'"
      v-if="item.type === 'text'"
      :placeholder="item.placeholder || ''"
      :placeholder="item.placeholder || '请输入'"
      @change="(e) => inputChange(e)"
      :clearable="true"
      v-model="val"
@@ -15,6 +15,7 @@
    <el-cascader
      v-model="val"
      v-if="item.type === 'cascader'"
      :placeholder="item.placeholder || '请选择'"
      :options="item.options"
      :props="item.optionsConfig.props||{ checkStrictly: true,emitPath: false,value: 'id' }"
      :show-all-levels="false"
@@ -26,7 +27,7 @@
    <!-- 下拉-->
    <el-select
      v-if="item.type === 'select'"
      :placeholder="item.placeholder || ''"
      :placeholder="item.placeholder || '请选择'"
      v-model="val"
      filterable
      :multiple="item.multiple || false"
@@ -54,7 +55,7 @@
    <!--时间-->
    <el-time-select
      v-if="item.type === 'time-picker'"
      :placeholder="item.placeholder || ''"
      :placeholder="item.placeholder || '请选择'"
      v-model="val"
      :clearable="true"
      style="width: 150px"
@@ -66,6 +67,7 @@
      v-model="val"
      type="year"
      :clearable="true"
      :placeholder="item.placeholder || '请选择'"
      style="width: 150px"
      :value-format="item.format?item.format:'yyyy'"
      @change="(v) => panelChange(v, 'yyyy')"
@@ -76,6 +78,7 @@
      v-model="val"
      type="month"
      :clearable="true"
      :placeholder="item.placeholder || '请选择'"
      style="width: 150px"
      :value-format="item.format?item.format:'yyyyMM'"
      @change="(v) => panelChange(v, 'yyyy-MM')"
@@ -86,6 +89,7 @@
      v-model="val"
      type="date"
      :clearable="true"
      :placeholder="item.placeholder || '请选择'"
      style="width: 150px"
      :value-format="item.format?item.format:'yyyyMMdd'"
      @change="(v) => panelChange(v, 'yyyy-MM-dd')"
@@ -96,6 +100,7 @@
      v-model="val"
      type="datetime"
      :clearable="true"
      :placeholder="item.placeholder || '请选择'"
      style="width: 150px"
      format="yyyy-MM-dd HH:mm:ss"
      value-format="yyyy-MM-dd HH:mm:ss"
@@ -106,7 +111,7 @@
      v-if="item.type === 'datetimerange-picker'"
      v-model="val"
      style="width: 378px"
      :placeholder="item.placeholder || ''"
      :placeholder="item.placeholder || '请选择'"
      type="datetimerange"
      :pickerOptions='pickerOptions'
      :disabled="item.disabled"
admin-web/src/utils/settingIplatform.js
@@ -1,24 +1,10 @@
// 请求接口地址 如果没有配置自动获取当前网址路径
const VUE_APP_API_URL = process.env.VUE_APP_BASE_API || `${location.origin}`;
const VUE_APP_WS_URL =
  process.env.VUE_APP_WS_URL || (location.protocol === 'https' ? 'wss' : 'ws') + ':' + location.hostname;
import config from '../../public/static/config.js'
const SettingIplatform = {
  // 服务器地址
  httpUrl: VUE_APP_API_URL,
  // 上传路径
  ftpUrl: 'https://yqzx.jinmingyuan.com/lowConsum',//开发
  // ftpUrl:'https://jmy.jinmingyuan.com/progress',// 测试,
// 接口请求地址
// apiBaseURL: 'http://116.198.39.83:8082/progress', // 正式
  // apiBaseURL: 'http://172.16.60.90:8082/progress',//开发
  // apiBaseURL: 'http://172.16.60.175:8083/lowConsum',//开发
  apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//开发
  // apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//开发
// apiBaseURL: 'https://jmy.jinmingyuan.com/progress',// 测试,
  // socket连接
  wsSocketUrl: VUE_APP_WS_URL,
  ftpUrl: config.ftpUrl,
  // 接口请求地址
  apiBaseURL: config.apiBaseURL,
};
export default SettingIplatform;
admin-web/src/utils/stockType.js
@@ -1,6 +1,6 @@
function stockType(row) {
  let result = '';
  let arr = ['采购入库', '调拨', '其他出库', '部门分发', '报废出库', '部门物品回退仓库', '物品盘点'];
  let arr = ['采购入库', '调拨', '其他出库', '部门分发', '报废出库', '物品退回', '物品盘点'];
  if (row.businessType == 7) {
    if (row.thisType == 1) {
      result = '盘盈入库';
admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -13,7 +13,7 @@
              <my-button name="物品分发" @click="handleAdd" site="tools" size="medium" icon="el-icon-edit-outline" />
              <my-button name="导入" @click="importSetting.dialogShow = true" site="tools" size="medium" />
            </div>
            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
            <div :style="{ 'overflow-y': 'auto', height: `calc(100vh - 320px)` }" 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">
admin-web/src/views/departmentitem/itemret/returnNote/index.vue
@@ -12,7 +12,7 @@
            <div class="table-tool-bar" style="margin-bottom: 15px;">
              <my-button name="新增" @click="handleAdd" site="tools" size="medium" />
            </div>
            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
            <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">
admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
@@ -12,7 +12,7 @@
            <div class="table-tool-bar" style="margin-bottom: 15px;">
              <my-button name="新增" @click="handleAdd" site="tools" size="medium" />
            </div>
            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
            <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">
admin-web/src/views/projectConfig/buildPlan/detail.vue
File was deleted
admin-web/src/views/projectConfig/buildPlan/edit.vue
File was deleted
admin-web/src/views/projectConfig/buildPlan/index.vue
File was deleted
admin-web/src/views/projectConfig/buildPlan/items.js
File was deleted
admin-web/src/views/projectConfig/buildPlan/nodeChoose/edit.vue
File was deleted
admin-web/src/views/projectConfig/buildPlan/nodeChoose/index.vue
File was deleted
admin-web/src/views/projectConfig/buildPlan/nodeChoose/items.js
File was deleted
admin-web/src/views/projectConfig/buildPlan/nodeChoose/nodeCycle.vue
File was deleted
admin-web/src/views/projectConfig/buildPlan/nodeChoose/preview.vue
File was deleted
admin-web/src/views/projectConfig/buildPlan/nodeChoose/stageNode.vue
File was deleted
admin-web/src/views/projectConfig/kanbanConfig/edit.vue
File was deleted
admin-web/src/views/projectConfig/kanbanConfig/index.vue
File was deleted
admin-web/src/views/projectConfig/kanbanConfig/items.js
File was deleted
admin-web/src/views/projectConfig/kanbanConfig/nodeChoose.vue
File was deleted
admin-web/src/views/projectConfig/stageConfig/edit.vue
File was deleted
admin-web/src/views/projectConfig/stageConfig/index.vue
File was deleted
admin-web/src/views/projectConfig/stageConfig/items.js
File was deleted
admin-web/src/views/projectConfig/stageConfig/node/edit.vue
File was deleted
admin-web/src/views/projectConfig/stageConfig/node/items.js
File was deleted
admin-web/src/views/projectConfig/stageConfig/node/node.vue
File was deleted
admin-web/src/views/projectConfig/warningConfig/chooseItems.js
File was deleted
admin-web/src/views/projectConfig/warningConfig/chooseUser.vue
File was deleted
admin-web/src/views/projectConfig/warningConfig/edit.vue
File was deleted
admin-web/src/views/projectConfig/warningConfig/index.vue
File was deleted
admin-web/src/views/projectConfig/warningConfig/items.js
File was deleted
admin-web/src/views/stock/accessStock/outbound/index.vue
@@ -12,50 +12,53 @@
            <div class="table-tool-bar" style="margin-bottom: 15px;">
              <my-button name="新增" @click="handleAdd" site="tools" size="medium" />
            </div>
            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" 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>
                        <div class="card-header-right">
            <div>
              <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>
                          <div class="card-header-right">
                            <el-button site="form" type="success" size="mini" @click="handleExport(item)"
                              >导出出库单</el-button
                            >导出出库单</el-button
                            >
                          <el-button name="查看详情" site="form" type="info" size="mini" @click="handleDetail(item)"
                            <el-button name="查看详情" site="form" type="info" size="mini" @click="handleDetail(item)"
                            >查看详情</el-button
                          >
                            >
                          </div>
                        </div>
                      </div>
                      <div class="one-hed">
                        <div class="box"><span class="span-two">机构:</span>{{ item.agencyName }}</div>
                        <div class="box"><span class="span-two">操作人:</span>{{ item.operatorName }}</div>
                        <div class="box">
                          <span class="span-two">出库时间:</span>{{ item.dealTime | formatTime }}
                        <div class="one-hed">
                          <div class="box"><span class="span-two">机构:</span>{{ item.agencyName }}</div>
                          <div class="box"><span class="span-two">操作人:</span>{{ item.operatorName }}</div>
                          <div class="box">
                            <span class="span-two">出库时间:</span>{{ item.dealTime | formatTime }}
                          </div>
                        </div>
                      </div>
                      <div class="card-end">
                        <div v-for="(just, index) in item.formOutputTemplateInfoList" :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 class="card-end">
                          <div v-for="(just, index) in item.formOutputTemplateInfoList" :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>
                    </div>
                  </el-card>
                </el-col>
              </el-row>
              <div class="no-data" v-else>暂无数据</div>
                    </el-card>
                  </el-col>
                </el-row>
                <div class="no-data" v-else>暂无数据</div>
              </div>
            </div>
            <el-pagination
              :small="false"
              :current-page="pageNum"
admin-web/src/views/stock/accessStock/outboundDetails/index.vue
@@ -10,11 +10,13 @@
          <el-row style="margin-top: 15px">
            <el-col>
              <!--列表-->
              <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
              <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
            </el-col>
          </el-row>
          <!--添加/编辑弹窗-->
          <detail v-if="detailSetting.show" :setting="detailSetting" @close="detailSetting.show = false" />
          <!--          <detail/>-->
          <component v-if="detailSetting.show" :setting="detailSetting" @close="detailSetting.show = false"
                     :is="activeDetail"></component>
        </el-card>
      </el-container>
    </el-container>
@@ -25,23 +27,41 @@
import MyTableV2 from '@/components/myTable/myTableV2';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import detail from '../outbound/detail';
import * as finsystenant from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
import { goodsTemplate, goodsModel } from '@/api/baseSetting/finsystenant';
import { outputDtailList } from '@/api/stock/accessStock';
import * as DateFormatter from '@/utils/DateFormatter';
import stockType from '@/utils/stockType';
import detail from '../outbound/detail';
import purchaseDetail from '@/views/stock/procure/purchaseOrder/detail.vue';// 采购单详情
import transferDetail from '@/views/stock/transfer/transferissue/detail.vue';// 调拨单详情
import inventoryDetail from '@/views/stock/inventorycount/inventorytask/detail.vue';// 盘点单详情
import scrapDetail from '@/views/stock/scrap/itemScrapping/detail.vue';// 报废单详情
import distributionDetail from '@/views/departmentitem/itemdis/distribution/detail.vue';// 分发单详情
import itemscrDetail from '@/views/departmentitem/itemscr/scrapping/detail.vue';// 部门报废单详情
import returnNoteDetail from '@/views/departmentitem/itemret/returnNote/detail.vue';// 部门退还单详情
export default {
  name: 'index',
  components: { MyButton, MyTableV2, detail, myImport },
  components: {
    MyButton,
    MyTableV2,
    detail,
    myImport,
    purchaseDetail,
    transferDetail,
    inventoryDetail,
    scrapDetail,
    distributionDetail,
    itemscrDetail,
    returnNoteDetail
  },
  data() {
    return {
      activeDetail: '',
      // 搜索框
      items: [
        {
          type: 'text',
          dataIndex: 'businessFormId',
          dataIndex: 'businessFormCode',
          label: '单号',
          placeholder: '请输入',
          defaultValue: '',
@@ -66,7 +86,7 @@
          placeholder: '请选择',
          defaultValue: '',
          options: [],
          cascader: [{ key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId' }],
          cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}],
          optionsConfig: {
            label: 'goodsName',
            value: 'id',
@@ -91,26 +111,26 @@
          dataIndex: 'agencyId',
          label: '机构',
          placeholder: '请选择',
          optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
          optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
          defaultValue: '',
          options: [],
        },
        {
          type: 'text',
          dataIndex: 'createdName',
          dataIndex: 'createName',
          label: '创建人',
          placeholder: '请输入',
          defaultValue: '',
        },
        {
          type: 'date-picker',
          dataIndex: 'dealTimeStart',
          dataIndex: 'startTime',
          label: '时间',
          defaultValue: '',
        },
        {
          type: 'date-picker',
          dataIndex: 'dealTimeEnd',
          dataIndex: 'endTime',
          label: '至',
          defaultValue: '',
        },
@@ -155,28 +175,34 @@
        },
        // 列信息
        columns: [
          { title: '类型', field: 'thisType', align: 'left' },
          { title: '单号', field: 'businessFormId', align: 'center' },
          { title: '物品名称', field: 'goodsTemplateName', align: 'center' },
          { title: '规格型号', field: 'baseGoodsModelsName', align: 'center' },
          { title: '出入库数量', field: 'thisCount', align: 'left' },
          { title: '金额', field: 'totalPrice', align: 'left' },
          { title: '所属机构', field: 'agencyName', align: 'left' },
          { title: '创建人', field: 'createdName', align: 'left' },
          {
            title: '类型', field: 'thisType', align: 'left',
            formatter: (row) => {
              let result = stockType(row)
              return {value: result};
            },
          },
          {title: '单号', field: 'businessFormCode', align: 'center', width: 130},
          {title: '物品名称', field: 'goodsTemplateName', align: 'left', minWidth: 130},
          {title: '规格型号', field: 'baseGoodsModelsName', align: 'left', minWidth: 130},
          {title: '出入库数量', field: 'thisCount', align: 'center', width: 100},
          {title: '金额', field: 'totalPrice', align: 'center', width: 100},
          {title: '所属机构', field: 'agencyName', align: 'left', minWidth: 130},
          {title: '创建人', field: 'operatorName', align: 'left', width: 100},
          {
            title: '操作时间',
            field: 'dealTime',
            align: 'center',
            width: 160,
            formatter: (row) => {
              return { value: DateFormatter.LongToDateTime(row.createTime) };
              return {value: DateFormatter.LongToDateTime(row.dealTime)};
            },
          },
        ],
        // 操作信息
        operation: {
          show: true, // 显示操作列
          width: '150', // 列宽
          width: 100, // 列宽
          attr: [
            {
              title: '详情',
@@ -197,12 +223,24 @@
          },
        },
      },
      components: {
        '1': 'purchaseDetail',
        '2': 'returnNoteDetail',
        '3': 'transferDetail',
        '4': 'inventoryDetail',
        '5': 'itemscrDetail',
        '6': 'transferDetail',
        '7': 'inventoryDetail',
        '8': 'scrapDetail',
        '9': 'detail',
      }
    };
  },
  created() {
  },
  methods: {
    showDetail(row) {
      this.activeDetail = this.components[row.mixType]
      this.detailSetting.id = row.id;
      this.detailSetting.info = JSON.stringify(row);
      this.detailSetting.title = '详情';
@@ -211,7 +249,7 @@
    // 查询table列表
    search(pageNum) {
      if (pageNum != undefined) {
        this.$refs.myTable.search(pageNum);
        this.$refs.myTable.search({pageNum});
      } else {
        this.$refs.myTable.search();
      }
admin-web/src/views/stock/procure/purchaseOrder/edit.vue
@@ -229,7 +229,6 @@
    };
    // 金额校验
    var checkPrice = (rule, value, callback) => {
      console.log(value);
      if (!value) {
        return callback(new Error('请输入'));
      }
@@ -241,7 +240,6 @@
    };
    // 数量校验
    var checkCounts = (rule, value, callback) => {
      console.log(value);
      if (!value) {
        return callback(new Error('请输入'));
      }
@@ -314,7 +312,6 @@
        title: '上传',
        max: 20, // 最大大小,单位M
        num: 10, // 支持上传图片个数
        accept: '.jpg,.png', // 限制格式
        tip: '', // 提示 默认:`只能上传${this.defaultSettings.num}个${this.defaultSettings.accept}文件,且不超过${this.defaultSettings.max}kb`
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
@@ -504,7 +501,6 @@
      this.$refs['ruleForm'].validate((valid) => {
        if (valid) {
          this.loading = true;
          console.log('formData', this.formData);
          if (!this.setting.id) {
            procureAdd(this.formData)
              .then((res) => {
@@ -513,7 +509,6 @@
                this.$emit('search');
              })
              .catch((err) => {
                console.log('create err', err);
                this.loading = false;
                this.$message.error('保存失败');
              });
@@ -525,7 +520,6 @@
                this.$emit('search');
              })
              .catch((err) => {
                console.log('edit err', err);
                this.loading = false;
                this.$message.error('保存失败');
              });
admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -14,7 +14,7 @@
              <my-button name="导入" @click="importSetting.dialogShow = true" site="tools" size="medium" />
            </div>
            <div v-loading="loading" style="margin-bottom: 15px">
              <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 360}px` }">
              <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }">
                <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">
admin-web/src/views/stock/scrap/itemScrapping/index.vue
@@ -12,7 +12,7 @@
            <div class="table-tool-bar" style="margin-bottom: 15px">
              <my-button name="新增" @click="handleAdd" site="tools" size="medium" />
            </div>
            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }">
            <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }">
              <el-row class="card" :gutter="5" v-loading="loading">
                <el-col v-for="(item, index) in list" :key="index" class="cm-item">
                  <el-card class="card-data">
admin-web/src/views/stock/transfer/transferApplication/index.vue
@@ -12,7 +12,7 @@
            <div class="table-tool-bar" style="margin-bottom: 15px">
              <my-button name="调拨申请" icon="el-icon-plus" @click="handleAdd" site="tools" size="medium" />
            </div>
            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
            <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">
admin-web/src/views/stock/transfer/transferissue/index.vue
@@ -9,7 +9,7 @@
        <el-row style="margin-top: 15px">
          <el-col>
            <!--列表-->
            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
            <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">