小修改

houjie

2023-09-05 6bc6b53ed1141673effd0ed265e13d34706cc3d2

小修改

 src/views/eam/EquipmentScrapList.vue

@@ -5,12 +5,12 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <!--          v-show="false"  hidden="true"-->
<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24" v-show="true">-->
<!--            &lt;!&ndash;            defaultValue="disposal"&ndash;&gt;-->
<!--            <a-form-item label="变动方式">-->
<!--              <a-input placeholder="请输入变动方式" v-model="queryParam.changeMethod" defaultValue="scrap"></a-input>-->
<!--            </a-form-item>-->
<!--          </a-col>-->
          <!--          <a-col :xl="6" :lg="7" :md="8" :sm="24" v-show="true">-->
          <!--            &lt;!&ndash;            defaultValue="disposal"&ndash;&gt;-->
          <!--            <a-form-item label="变动方式">-->
          <!--              <a-input placeholder="请输入变动方式" v-model="queryParam.changeMethod" defaultValue="scrap"></a-input>-->
          <!--            </a-form-item>-->
          <!--          </a-col>-->

          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="单据号">
@@ -90,12 +90,16 @@
      :customRow="clickThenSelect"
      @change="handleTableChange">

      <span slot="num" slot-scope="text">
          <j-ellipsis :value="text" :length="15" />
        </span>
      <template slot="htmlSlot" slot-scope="text">
        <div v-html="text"></div>
      </template>
      <template slot="imgSlot" slot-scope="text,record">
        <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
        <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;" />
        <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
             style="max-width:80px;font-size: 12px;font-style: italic;" />
      </template>
      <template slot="fileSlot" slot-scope="text">
        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@@ -109,28 +113,20 @@
          下载
        </a-button>
      </template>
      <!--        <template>-->
      <!--          <a-tooltip placement="topLeft">-->
      <!--            <template slot="title">-->
      <!--              <span>{{value}}</span>-->
      <!--            </template>-->
      <!--            {{ value | ellipsis(length) }}-->
      <!--          </a-tooltip>-->
      <!--        </template>-->
      <!-- 字符串超长截取省略号显示-->
      <span slot="remark" slot-scope="text">
          <j-ellipsis :value="text" :length="15" />
        </span>

        <span
          slot="action"
          slot-scope="text, record"
        >
      <span
        slot="action"
        slot-scope="text, record"
      >
        <a-popconfirm
                  v-if="record.auditStatus == 'notSubmitted'||record.auditStatus =='Rejected'"
                  title="确认提交吗?"
                  @confirm="() =>handleCommit(record,'commit')"
                >
          v-if="record.auditStatus == 'notSubmitted'||record.auditStatus =='Rejected'"
          title="确认提交吗?"
          @confirm="() =>handleCommit(record,'commit')"
        >
                  <a>提交</a>
                </a-popconfirm>
                <a-popconfirm
@@ -201,19 +197,18 @@
      </a-tab-pane>
    </a-tabs>
    <equipment-scrap-modal ref="modalForm" @ok="modalFormOk"></equipment-scrap-modal>
    <approvel-modal ref="approvalModalForm" @ok='approvalModalFormOk' @cancel='approvalModalFormOk'></approvel-modal>
    <approvel-modal ref="approvalModalForm" @ok="approvalModalFormOk" @cancel="approvalModalFormOk"></approvel-modal>
  </a-card>
</template>

<script>

import { JeecgListMixin } from '@/mixins/JeecgListMixin'

import EquipmentScrapModal from './modules/equipmentScrap/EquipmentScrapModal.vue'
import EquipmentScrapDetailList from './modules/equipmentScrap/EquipmentScrapDetailList'
import { getAction,postAction } from '@/api/manage'
import { initDictOptions, filterMultiDictText } from '@/components/dict/JDictSelectUtil'
import { getAction, postAction } from '@/api/manage'
import JEllipsis from '@/components/jeecg/JEllipsis'

import '@/assets/less/TableExpand.less'
import ApprovelModal from './modules/equipmentSeal/ApprovelModal'

@@ -245,7 +240,11 @@
          title: '单据号',
          align: 'center',
          sorter: true,
          dataIndex: 'num'
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          width: 100,
          ellipsis: true

        },
        {
          title: '审批状态',
@@ -386,30 +385,30 @@
        }
        this.loading = false
      })
      this.equipmentScrapDetailMainId = ""
      this.equipmentScrapDetailMainId = ''
    },
    handleCommit(record, type) {
        let url
      let url
      type == 'commit' ? record.auditStatus = 'pendingApproval' : record.auditStatus = 'notSubmitted'
      type == 'commit' ? url = this.url.submit : url = this.url.revocation
      postAction(url, record).then(res => {
        if (res.success) {
          if (type === 'commit') {
            this.$message.success("提交成功！");
            this.$message.success('提交成功！')
          } else {
            this.$message.success("撤回成功！");
            this.$message.success('撤回成功！')
          }

          this.loadData(1);
          this.loadData(1)
        } else {
          this.$message.warning(res.message);
          this.$message.warning(res.message)
        }
      })
    },
    handleApprove: function(record) {
      let approve
      approve = this.url.approve
      this.$refs.approvalModalForm.showModals(record, approve,'Approved','Rejected')
      this.$refs.approvalModalForm.showModals(record, approve, 'Approved', 'Rejected')
      this.$refs.approvalModalForm.title = '审批'
      this.$refs.approvalModalForm.disableSubmit = false


 src/views/eam/EquipmentSealList.vue

@@ -103,7 +103,9 @@
        :customRow="clickThenSelect"
        @change="handleTableChange"
      >

<span slot="num" slot-scope="text">
          <j-ellipsis :value="text" :length="15" />
        </span>
        <template
          slot="htmlSlot"
          slot-scope="text"
@@ -286,7 +288,10 @@
          title: '单据号',
          align: "center",
          sorter: true,
          dataIndex: 'num'
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          width: 100,
          ellipsis: true
        },
        {
          title: '创建人',

 src/views/eam/EquipmentUnsealList.vue

@@ -110,7 +110,9 @@
        :customRow="clickThenSelect"
        @change="handleTableChange"
      >

<span slot="num" slot-scope="text">
          <j-ellipsis :value="text" :length="15" />
        </span>
        <template
          slot="htmlSlot"
          slot-scope="text"
@@ -293,7 +295,10 @@
          title: '单据号',
          align: 'center',
          sorter: true,
          dataIndex: 'num'
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          width: 100,
          ellipsis: true
        },
        {
          title: '创建人',
@@ -483,7 +488,7 @@
      }
      deleteAction(this.url.delete, { id: id }).then(res => {
        if (res.success) {
          //重新计算分页问题    
          //重新计算分页问题
          this.reCalculatePage(1)
          this.$message.success(res.message)
          this.loadData()

 src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue

@@ -5,31 +5,60 @@
    <!--主表区域 -->
    <!--    <a-tab-pane tab="设备变动" :key="refKeys[0]" :forceRender="true" :class="'jeecg-tabs-top'" :animated="false">-->
    <j-form-container :disabled="formDisabled">
    <a-form-model ref="form" :model="model" :rules="validatorRules">
      <a-row>
        <a-col :xs="24" :sm="24">
          <a-form-model-item label="单据号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
            <a-input v-model="model.num" placeholder="请输入单据号"></a-input>
          </a-form-model-item>
        </a-col>
        <!--                  <a-col :xs="24" :sm="12">-->
        <!--                    <a-form-model-item label="审批状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">-->
        <!--                      <j-dict-select-tag type="list" v-model="model.auditStatus"  dictCode="audit_status" placeholder="请选择审批状态" disabled/>-->
        <!--                    </a-form-model-item>-->
        <!--                  </a-col>-->
        <a-col :xs="24" :sm="12" v-show="false">
          <a-form-model-item label="变动方式" show="false" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="changeMethod">
            <a-input v-model="model.changeMethod" placeholder="请输入变动方式" defaultValue="scrap"></a-input>
          </a-form-model-item>
        </a-col>
        <a-col :xs="24" :sm="24">
          <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
            <a-textarea v-model="model.remark" rows="4" placeholder="请输入备注" />
          </a-form-model-item>
        </a-col>

      </a-row>
    </a-form-model>
      <!-- 主表单区域 -->
      <a-form-model
        ref="form"
        :model="model"
        :rules="validatorRules"
        slot="detail"
      >
        <a-row>
          <a-col :span="24">
            <a-form-model-item
              label="单据号"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="num"
            >
              <a-input
                v-model="model.num"
                placeholder="请输入单据号"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col
            :span="12"
            :hidden=true
          >
            <a-form-model-item
              label="变动方式"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="changeMethod"
            >
              <a-input
                v-model="model.changeMethod"
                placeholder="请输入变动方式"
                defaultValue="seal"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item
              label="备注"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="remark"
            >
              <a-textarea
                v-model="model.remark"
                rows="4"
                placeholder="请输入备注"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </j-form-container>
    <!--     </a-tab-pane>-->