Merge remote-tracking branch 'origin/master'

zhaowei

2025-06-09 a00b50f20267948804399af79f0c5c1dec671a2c

Merge remote-tracking branch 'origin/master'

 src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue

@@ -34,6 +34,10 @@
                     @change="handleTableChange"
                     :scroll="{y:456}" :size="size" rowKey="docId">

              <!-- å­—符串超长截取省略号显示-->
              <span slot="docName" slot-scope="text">
                <j-ellipsis :value="text"/>
              </span>
            </a-table>
          </a-tab-pane>
        </a-tabs>
@@ -121,6 +125,7 @@
          dataIndex: 'docName',
          key: 'docName',
          align: 'center',
          scopedSlots: { customRender: 'docName' },
          width: 300,
          sorter: true
        },

 src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue

@@ -200,9 +200,15 @@
    methods: {
      initDictConfig(){
      },
      getGuideCardBatchList(){
        console.log('currentDocumentInfo', this.guideCardBatchInfo)
        let params
      searchQuery() {
        this.queryParam.docId = this.guideCardBatchInfo.docId;
        this.loadData(1);
      },
      /**
      * èŽ·å–加工确认表列表
      */
      getGuideCardBatchList() {
        let params= {};
        params.docId=this.guideCardBatchInfo.docId;
        params.serialNumber=this.queryParam.serialNumber;
        params.fixtureInformation=this.guideCardBatchInfo.fixtureInformation;
@@ -224,6 +230,19 @@
          this.loading = false
        })
      },
      searchReset() {
        // ä¿ç•™å¿…要字段的浅拷贝方式
        this.queryParam = {
          docId: this.guideCardBatchInfo.docId
        };
        this.loadData(1);
      },
      loadData(pageNum) {
        if (this.ipagination) {
          this.ipagination.current = pageNum;
        }
        this.getGuideCardBatchList();
      },
      getSuperFieldList(){
        let fieldList=[];
        fieldList.push({type:'string',value:'serialNumber',text:'流水号',dictCode:''})

 src/views/eam/repair/EamRepairOrderList.vue

@@ -44,7 +44,7 @@

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator" v-if="isDisplayOperation">
      <a-button @click="handleOpenReceiveFaultModal" type="primary" icon="plus">领取</a-button>
      <a-button @click="handleOpenReceiveFaultModal" type="primary" icon="plus"  v-if="isShowAuth('eam:repair:collect')">领取</a-button>
      <!--<a-button type="primary" icon="download" @click="handleExportXls('维修工单')">导出</a-button>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
@@ -123,23 +123,34 @@
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            },
            fixed: 'left',
          },
          {
            title: '工单编号',
            align: 'center',
            dataIndex: 'repairCode',
            width: 200,
            width: 120,
            fixed: 'left'
          },
          // {
          //   title: '报修编号',
          //   align: 'center',
          //   dataIndex: 'reportId',
          //   width: 200,
          //   fixed: 'left'
          // },
          {
            title: '设备编号',
            align: 'center',
            dataIndex: 'equipmentId_dictText',
            dataIndex: 'equipmentCode',
            width: 120,
            fixed: 'left'
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName',
            width: 200,
            fixed: 'left'
          },

 src/views/eam/repair/EamReportRepairList.vue

@@ -58,7 +58,7 @@

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator" v-if="isDisplayOperation">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button @click="handleAdd" type="primary" icon="plus" v-if="isShowAuth('eam:reportRepair:add')">新增</a-button>
      <!--<a-button type="primary" icon="download" @click="handleExportXls('故障报修')">导出</a-button>-->
      <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
      <!--@change="handleImportExcel">-->
@@ -66,7 +66,7 @@
      <!--</a-upload>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel">
          <a-menu-item key="1" @click="batchDel" v-if="isShowAuth('eam:reportRepair:abolish')">
            <a-icon type="delete"/>
            ä½œåºŸ
          </a-menu-item>
@@ -103,15 +103,15 @@
        </template>

        <span slot="action" slot-scope="text, record" v-if="record.reportStatus=='WAIT_REPAIR'">
          <a @click="handleEdit(record)">编辑</a>
          <a @click="handleEdit(record)" v-if="isShowAuth('eam:reportRepair:edit')">编辑</a>

          <a-divider type="vertical"/>
          <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:edit')"/>

          <a @click="handleAssign(record)">指派</a>
          <a @click="handleAssign(record)" v-if="isShowAuth('eam:reportRepair:assign')">指派</a>

          <a-divider type="vertical"/>
          <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:assign')"/>

          <a-popconfirm title="确定作废吗?" @confirm="() => handleDelete(record.id)">
          <a-popconfirm title="确定作废吗?" @confirm="() => handleDelete(record.id)" v-if="isShowAuth('eam:reportRepair:abolish')">
            <a>作废</a>
          </a-popconfirm>
        </span>
@@ -178,7 +178,13 @@
          {
            title: '设备编号',
            align: 'center',
            dataIndex: 'equipmentId_dictText',
            dataIndex: 'equipmentCode',
            width: 200
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName',
            width: 200
          },
          {

 src/views/flowable/workflow/FlowTodo.vue

@@ -345,7 +345,8 @@
        {
          title: '流程分类',
          align: 'center',
          dataIndex: 'category_dictText'
          dataIndex: 'category_dictText',
          width: 100
        },
        {
          title: '流程名称',

 src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue

@@ -141,11 +141,11 @@
                <a-input :disabled='coldisabled' v-model='tableRowRecord.applyTime'></a-input>
              </a-form-model-item >
            </a-col>
            <a-col :span="24">
              <a-form-item label="密级为" :labelCol="labelCol" :wrapperCol="wrapperCol">
                <j-dict-select-tag  type='list' v-model='assignFileStream.secretLevel' dictCode='dnc_secret_level' placeholder="请选择密级"  />
              </a-form-item>
            </a-col>
<!--            <a-col :span="24">-->
<!--              <a-form-item label="密级为" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!--                <j-dict-select-tag  type='list' v-model='assignFileStream.secretLevel' dictCode='dnc_secret_level' placeholder="请选择密级"  />-->
<!--              </a-form-item>-->
<!--            </a-col>-->
            <a-col :span="24" class="btxx">
              <a-form-item label="审批状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                <j-dict-select-tag  type='list' v-model='assignFileStream.status' dictCode='dnc_assign_stream_status' placeholder="请选择审批状态"  />

 src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue

@@ -57,45 +57,179 @@
          </a-col>
        </a-row>

        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">是否需要领用备件</a-divider>

        <a-tabs v-model="activeTabKey">
          <a-tab-pane key="1" tab="领用备件">
            <a-row>
              <a-col :span="twoColSpan*2">
                <a-form-model-item label="是否需要领用备件" prop="isUseSpare">
                  <a-radio-group v-model="tableRowRecord.isUseSpare"
                                 :disabled="isDisableUseSpare">
                    <a-radio :value="1">是</a-radio>
                    <a-radio :value="0">否</a-radio>
                  </a-radio-group>
                </a-form-model-item>
              </a-col>
          <a-tab-pane key="1" tab="维修处理">

              <template v-if="tableRowRecord.isUseSpare===0">
            <div v-if="repairConfirm">
              <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">维修确认</a-divider>

              <a-row :gutter="24">
                <a-col :span="12">
                  <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairConfirm" label="是否内部可维修">
                    <j-dict-select-tag type='radio' v-model='tableRowRecord.repairConfirm' dictCode='yn'
                                       placeholder="请选择" :disabled="disableSubmit || tableRowRecord.repairStatus !== 'WAIT_INTERNAL_CONFIRM'"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="12">
                  <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairConfirmComment" label="维修确认意见">
                    <a-textarea placeholder="请输入意见" v-model="tableRowRecord.repairConfirmComment"
                                :readOnly="disableSubmit || tableRowRecord.repairStatus !== 'WAIT_INTERNAL_CONFIRM'"/>
                  </a-form-model-item>
                </a-col>
              </a-row>
            </div>
            <div v-if="underInternalRepair && tableRowRecord.repairConfirm === '1'">
              <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">维修结果</a-divider>
              <a-row>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="故障原因" prop="faultReason">
                    <a-input :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_REPAIR'"
                  <a-form-model-item label="故障原因" prop="faultReason" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <a-input :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_INTERNAL_REPAIR'"
                             v-model="tableRowRecord.faultReason" rows="4"
                             placeholder="请输入故障原因"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="维修结果描述" prop="repairDescription">
                    <a-textarea :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_REPAIR'"
                  <a-form-model-item label="维修结果描述" prop="repairDescription" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <a-textarea :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_INTERNAL_REPAIR'"
                                v-model="tableRowRecord.repairDescription"
                                placeholder="请输入维修结果描述"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="维修图片">
                  <a-form-model-item label="维修图片" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <lx-upload :returnUrl="false" :isMultiple="true" file-type="image" :number="3"
                               :disabled="disableSubmit||tableRowRecord.repairStatus!=='UNDER_REPAIR'"
                               :disabled="disableSubmit||tableRowRecord.repairStatus!=='UNDER_INTERNAL_REPAIR'"
                               v-model="tableRowRecord.imageFiles"/>
                  </a-form-model-item>
                </a-col>
              </template>
            </a-row>
              </a-row>
            </div>
            <div v-if="leaderConfirm && tableRowRecord.repairConfirm === '0'">
              <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">领导确认</a-divider>

              <a-row :gutter="24">
                <a-col :span="12">
                  <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leaderConfirm" label="是否同意外部维修">
                    <j-dict-select-tag type='radio' v-model='tableRowRecord.leaderConfirm' dictCode='approved_rejected'
                                       placeholder="请选择" :disabled="disableSubmit || tableRowRecord.repairStatus!=='WAIT_LEADER_CONFIRM'"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="12">
                  <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leaderConfirmComment" label="确认意见">
                    <a-textarea placeholder="请输入意见" v-model="tableRowRecord.leaderConfirmComment"
                                :readOnly="disableSubmit || tableRowRecord.repairStatus!=='WAIT_LEADER_CONFIRM'"/>
                  </a-form-model-item>
                </a-col>
              </a-row>
            </div>
            <div v-if="underInternalRepair && tableRowRecord.leaderConfirm === '2'">
              <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">维修结果</a-divider>
              <a-row>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="故障原因" prop="faultReason" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <a-input :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_INTERNAL_REPAIR'"
                             v-model="tableRowRecord.faultReason" rows="4"
                             placeholder="请输入故障原因"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="维修结果描述" prop="repairDescription" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <a-textarea :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_INTERNAL_REPAIR'"
                                v-model="tableRowRecord.repairDescription"
                                placeholder="请输入维修结果描述"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="维修图片" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <lx-upload :returnUrl="false" :isMultiple="true" file-type="image" :number="3"
                               :disabled="disableSubmit||tableRowRecord.repairStatus!=='UNDER_INTERNAL_REPAIR'"
                               v-model="tableRowRecord.imageFiles"/>
                  </a-form-model-item>
                </a-col>
              </a-row>
            </div>
            <div v-if="externalConfirm && tableRowRecord.leaderConfirm === '1'">
              <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">机动办确认</a-divider>

              <a-row :gutter="24">
                <a-col :span="12">
                  <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="externalConfirm" label="机动办是否可维修">
                    <j-dict-select-tag type='radio' v-model='tableRowRecord.externalConfirm' dictCode='yn'
                                       placeholder="请选择" :disabled="disableSubmit||tableRowRecord.repairStatus!=='WAIT_EXTERNAL_CONFIRM'"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="12">
                  <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="externalConfirmComment" label="确认意见">
                    <a-textarea placeholder="请输入意见" v-model="tableRowRecord.externalConfirmComment"
                                :readOnly="disableSubmit || tableRowRecord.repairStatus!=='WAIT_EXTERNAL_CONFIRM'"/>
                  </a-form-model-item>
                </a-col>
              </a-row>
            </div>
            <div v-if="underExternalRepair && tableRowRecord.externalConfirm === '1'">
              <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">机动办维修结果</a-divider>
              <a-row>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="故障原因" prop="faultReason" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <a-input :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_EXTERNAL_REPAIR'"
                             v-model="tableRowRecord.faultReason" rows="4"
                             placeholder="请输入故障原因"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="维修结果描述" prop="repairDescription" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <a-textarea :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_EXTERNAL_REPAIR'"
                                v-model="tableRowRecord.repairDescription"
                                placeholder="请输入维修结果描述"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="维修图片" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <lx-upload :returnUrl="false" :isMultiple="true" file-type="image" :number="3"
                               :disabled="disableSubmit||tableRowRecord.repairStatus!=='UNDER_EXTERNAL_REPAIR'"
                               v-model="tableRowRecord.imageFiles"/>
                  </a-form-model-item>
                </a-col>
              </a-row>
            </div>
            <div v-if="underOutsideRepair && tableRowRecord.externalConfirm === '0'">
              <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">委外维修结果</a-divider>
              <a-row>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="故障原因" prop="faultReason" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <a-input :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_OUTSIDE_REPAIR'"
                             v-model="tableRowRecord.faultReason" rows="4"
                             placeholder="请输入故障原因"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="维修结果描述" prop="repairDescription" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <a-textarea :readOnly="disableSubmit||tableRowRecord.repairStatus!=='UNDER_OUTSIDE_REPAIR'"
                                v-model="tableRowRecord.repairDescription"
                                placeholder="请输入维修结果描述"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="twoColSpan*2">
                  <a-form-model-item label="维修图片" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                    <lx-upload :returnUrl="false" :isMultiple="true" file-type="image" :number="3"
                               :disabled="disableSubmit||tableRowRecord.repairStatus!=='UNDER_OUTSIDE_REPAIR'"
                               v-model="tableRowRecord.imageFiles"/>
                  </a-form-model-item>
                </a-col>
              </a-row>
            </div>
            <div v-if="operatorConfirm">
              <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">操作工确认</a-divider>

              <a-row :gutter="24">
                <a-col :span="24">
                  <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="confirmComment" label="确认意见">
                    <a-textarea placeholder="请输入意见" v-model="tableRowRecord.confirmComment"
                                :readOnly="disableSubmit || tableRowRecord.repairStatus!=='WAIT_CONFIRM'"/>
                  </a-form-model-item>
                </a-col>
              </a-row>
            </div>
          </a-tab-pane>

          <template v-if="selectShenpiData.procInstId">
@@ -116,56 +250,10 @@
            </a-tab-pane>

            <a-tab-pane key='3' tab='流程图'>
              <img :src="imageSrc" alt="Fetched Image"/>-->
              <img :src="imageSrc" alt="Fetched Image"/>
            </a-tab-pane>
          </template>
        </a-tabs>

        <template v-if="tableRowRecord.isUseSpare===1&&isDisableUseSpare">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">管理员领用备件
          </a-divider>

          <a-row>
            <a-col :span="twoColSpan*2">
              <a-form-model-item prop="sparePartDescription" label="备件描述">
                <a-textarea placeholder="请输入备件描述" :readOnly="disableSubmit||tableRowRecord.repairStatus!=='WAIT_SPARES'"
                            v-model="tableRowRecord.sparePartDescription"></a-textarea>
              </a-form-model-item>
            </a-col>
          </a-row>
        </template>

        <template v-if="Boolean(tableRowRecord.sparePartDescription)&&isDisplayRepairResult">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;">维修结果上报</a-divider>
          <a-row>
            <a-col :span="twoColSpan*2">
              <a-form-model-item label="故障原因" prop="faultReason">
                <a-input :readOnly="disableSubmit||isDisableSubmitRepairResult" v-model="tableRowRecord.faultReason"
                         rows="4" placeholder="请输入故障原因"/>
              </a-form-model-item>
            </a-col>
          </a-row>

          <a-row>
            <a-col :span="twoColSpan*2">
              <a-form-model-item label="维修结果描述" prop="repairDescription">
                <a-textarea :readOnly="disableSubmit||isDisableSubmitRepairResult"
                            v-model="tableRowRecord.repairDescription"
                            placeholder="请输入维修结果描述"/>
              </a-form-model-item>
            </a-col>
          </a-row>

          <a-row>
            <a-col :span="twoColSpan*2">
              <a-form-model-item label="维修图片">
                <lx-upload :disabled="disableSubmit||isDisableSubmitRepairResult" :returnUrl="false" :isMultiple="true"
                           file-type="image" :number="3"
                           v-model="tableRowRecord.imageFiles"/>
              </a-form-model-item>
            </a-col>
          </a-row>
        </template>
      </a-form-model>
    </a-spin>
  </j-modal>
@@ -173,8 +261,8 @@

<script>
  import '@assets/less/TableExpand.less'
  import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
  import LxSearchEquipmentSelect from '../../../eam/equipment/modules/LxSearchEquipmentSelect'
  import { getAction, downFile, httpAction } from '@api/manage'
  import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect'

  export default {
    name: 'RepairOrderApprovalModal',
@@ -215,11 +303,26 @@
          sm: { span: 20 }
        },
        validatorRules: {
          isUseSpare: [
            { required: true, message: '请选择是否需要领用备件' }
          repairConfirm: [
            { required: true, message: '请选择是否内部可维修！' }
          ],
          sparePartDescription: [
            { required: true, message: '请输入备件描述' }
          repairConfirmComment: [
            { required: true, message: '请输入维修确认意见' }
          ],
          leaderConfirm: [
            { required: true, message: '请选择是否同意外部维修！' }
          ],
          leaderConfirmComment: [
            { required: true, message: '请输入领导确认意见' }
          ],
          externalConfirm: [
            { required: true, message: '请选择机动办是否可维修！' }
          ],
          externalConfirmComment: [
            { required: true, message: '请输入机动办确认意见' }
          ],
          confirmComment: [
            { required: true, message: '请输入操作工确认意见' }
          ],
          faultReason: [
            { required: true, message: '请输入故障原因' }
@@ -240,13 +343,25 @@
      }
    },
    computed: {
      isDisableUseSpare() {
        return this.disableSubmit || this.tableRowRecord.repairStatus !== 'UNDER_REPAIR' || Boolean(this.tableRowRecord.sparePartDescription)
      repairConfirm() {
        return ['WAIT_INTERNAL_CONFIRM', 'UNDER_INTERNAL_REPAIR', 'WAIT_LEADER_CONFIRM', 'WAIT_EXTERNAL_CONFIRM', 'UNDER_EXTERNAL_REPAIR', 'UNDER_OUTSIDE_REPAIR', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.tableRowRecord.repairStatus)
      },
      isDisplayRepairResult() {
        return ['UNDER_REPAIR', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.tableRowRecord.repairStatus)
      underInternalRepair() {
        return ['UNDER_INTERNAL_REPAIR', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.tableRowRecord.repairStatus)
      },
      isDisableSubmitRepairResult() {
      leaderConfirm() {
        return ['UNDER_INTERNAL_REPAIR', 'WAIT_LEADER_CONFIRM', 'WAIT_EXTERNAL_CONFIRM', 'UNDER_EXTERNAL_REPAIR', 'UNDER_OUTSIDE_REPAIR', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.tableRowRecord.repairStatus)
      },
      externalConfirm() {
        return ['WAIT_EXTERNAL_CONFIRM', 'UNDER_EXTERNAL_REPAIR', 'UNDER_OUTSIDE_REPAIR', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.tableRowRecord.repairStatus)
      },
      underExternalRepair() {
        return ['UNDER_EXTERNAL_REPAIR', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.tableRowRecord.repairStatus)
      },
      underOutsideRepair() {
        return ['UNDER_OUTSIDE_REPAIR', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.tableRowRecord.repairStatus)
      },
      operatorConfirm() {
        return ['WAIT_CONFIRM', 'COMPLETE'].includes(this.tableRowRecord.repairStatus)
      }
    },
@@ -313,14 +428,20 @@
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = that.spinning = true
            const { isUseSpare, faultReason, repairDescription, sparePartDescription, imageFiles, equipmentId } = that.tableRowRecord
            const { confirmComment, externalConfirm, externalConfirmComment, repairConfirm, repairConfirmComment, leaderConfirm, leaderConfirmComment, faultReason, repairDescription, imageFiles, equipmentId } = that.tableRowRecord
            const { dataId, id, procInstId, taskDefKey, variables } = that.selectShenpiData

            const flowTaskVo = {}
            flowTaskVo.isUseSpare = isUseSpare
            flowTaskVo.repairConfirm = repairConfirm
            flowTaskVo.repairConfirmComment = repairConfirmComment
            flowTaskVo.leaderConfirm = leaderConfirm
            flowTaskVo.leaderConfirmComment = leaderConfirmComment
            flowTaskVo.externalConfirm = externalConfirm
            flowTaskVo.externalConfirmComment = externalConfirmComment
            flowTaskVo.confirmComment = confirmComment

            flowTaskVo.faultReason = faultReason
            flowTaskVo.repairDescription = repairDescription
            flowTaskVo.sparePartDescription = sparePartDescription
            flowTaskVo.imageFilesResult = imageFiles
            flowTaskVo.equipmentId = equipmentId
            flowTaskVo.id = dataId

 src/views/tms/ToolLedgerList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
<template>
  <a-row
    type="flex"
    :gutter="16"
  >
    <a-col
      :md="5"
      :sm="24"
    >
      <tool-ledger-list-left />
    </a-col>
    <a-col
      :md="24-5"
      :sm="24"
    >
      <tool-ledger-list-right />
    </a-col>
  </a-row>
</template>

<script>
import ToolLedgerListLeft from './modules/toolLedger/ToolLedgerListLeft'
import ToolLedgerListRight from './modules/toolLedger/ToolLedgerListRight'
export default {
  name: 'ToolLedgerList',
  components: { ToolLedgerListLeft, ToolLedgerListRight },
  data() {
    return {
      description: '工具台账信息',
      currentOrgCode: ''
    }
  },
  methods: {}
}
</script>

<style scoped>
@import '~@assets/less/common.less';
</style>

 src/views/tms/modules/inbound/InboundModel.vue

@@ -46,6 +46,18 @@
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="库位号" prop="locationCodeId">
              <a-select
                :triggerChange="true"
                :options="locationCodeOptions"
                v-model="model.locationCodeId"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借出工具</a-button>
@@ -174,6 +186,12 @@
              message: '请选择申请入库日期!',
            },
          ],
          locationCodeId:[
            {
              required: true,
              message: '请选择库位号!',
            },
          ]
      },
      url: {
        addInStorage: '/tms/inboundOrder/addInStorage',
@@ -233,12 +251,18 @@
          scopedSlots: { customRender: 'action' },
        },
      ],
      classifyId:''
      classifyId:'',
      locationCodeOptions:[]
    }
  },
  created() {
    //备份model原始值
    this.modelDefault = JSON.parse(JSON.stringify(this.model));
    ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
  },
  methods: {
    modalFormOk() {
@@ -402,7 +426,7 @@
          toolModel: data[i].toolModel,
          applicationType: data[i].applicationTypeName,
          onlyCode:data[i].onlyCode,
          inStorageQuantity:data[i].storageQuantity || data[i].quantity,
          inStorageQuantity:data[i].storageQuantity || data[i].quantity || 1,
          quantity:data[i].quantity,
          accuracyClass:data[i].accuracyClass
        })

 src/views/tms/modules/inboundOrder/InboundOrderModel.vue

@@ -41,7 +41,23 @@
            </a-form-item>
          </a-col>
          <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="库位号">
             <a-select
                :triggerChange="true"
                :options="locationCodeOptions"
                v-decorator="[ 'locationCodeId', validatorRules.locationCodeId ]"
              />
            </a-form-item>
          </a-col>
          <!-- <a-col :span="24 / 2">
            <a-form-item label="申请原因" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入申请原因"  :disabled="disableSubmit" v-decorator="['applicationReason', validatorRules.applicationReason]" />
            </a-form-item>
          </a-col> -->
        </a-row>
         <a-row style="width: 100%">
          <a-col :span="24">
             <a-form-item label="申请原因" :labelCol="{ span: 3 }" :wrapperCol="{ span: 21 }" >
             <a-input placeholder="请输入申请原因"  :disabled="disableSubmit" v-decorator="['applicationReason', validatorRules.applicationReason]" />
            </a-form-item>
          </a-col>
@@ -324,9 +340,16 @@
          scopedSlots: { customRender: 'action' },
        },
      ],
      locationCodeOptions:[]
    }
  },
  created() {},
  created() {
    ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
  },
  methods: {
    modalFormOk() {
    },
@@ -531,7 +554,7 @@
          applicationType: data[i].applicationTypeName,
          onlyCode:data[i].onlyCode,
          quantity:data[i].quantity,
          inStorageQuantity:data[i].storageQuantity || data[i].quantity,
          inStorageQuantity:data[i].storageQuantity || data[i].quantity || 1,
          accuracyClass:data[i].accuracyClass
        })
      }

 src/views/tms/modules/toolLedger/InStoreDetailList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,109 @@
<template>
  <a-card
    :bordered="false"
    class="card-area"
  >
    <a-table
      ref="table"
      bordered
      size="middle"
      rowKey="id"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
      @change="handleTableChange"
    >
    </a-table>
  </a-card>
</template>

<script>
import { requestPut } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'

export default {
  name: 'InStoreDetailList',
  mixins: [JeecgListMixin],
  components: {},
  data() {
    return {
      url: {
        list: '/tms/inStoreDetail/list',
      },
      queryParam: {},
      nodeType: 0,
      dataSource: [],
      disableMixinCreated:true,
      columns: [
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolCode',
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'onlyCode',
        },
        {
          title: '工具名称',
          dataIndex: 'chineseName',
          align: 'center',
          key: 'toolName'
        },
        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          align: 'center',
        },
        {
          title: '入库单编号',
          dataIndex: 'inboundNum',
          align: 'center',
        },
        {
          title: '入库类型',
          dataIndex: 'inStorehouseTypeName',
          align: 'center',
        },
        {
          title: '入库方式',
          dataIndex: 'operateType',
          align: 'center',
        },
        {
          title: '经手人',
          dataIndex: 'handler',
          align: 'center',
        },
        {
          title: '库位号',
          dataIndex: 'locationCode',
          align: 'center',
        },
        {
          title: '入库数量',
          dataIndex: 'inNumber',
          align: 'center',
        },
      ],
      para:{},
    }
  },

  methods: {
   
  },
  mounted() {
    this.$bus.$on('getToolLedgerData', (data) => {
      this.queryParam.toolCode = data.toolCode;
      this.searchQuery();
    })
  }
}
</script>

<style scoped>
@import '~@assets/less/common.less';
</style>

 src/views/tms/modules/toolLedger/OutStoreDetailList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,109 @@
<template>
  <a-card
    :bordered="false"
    class="card-area"
  >
    <a-table
      ref="table"
      bordered
      size="middle"
      rowKey="id"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
      @change="handleTableChange"
    >
    </a-table>
  </a-card>
</template>

<script>
import { requestPut } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'

export default {
  name: 'OutStoreDetailList',
  mixins: [JeecgListMixin],
  components: {},
  data() {
    return {
      url: {
        list: '/tms/outStoreDetail/outStoreDetailList',
      },
      queryParam: {},
      nodeType: 0,
      dataSource: [],
      disableMixinCreated:true,
      columns: [
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolCode',
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'onlyCode',
        },
        {
          title: '工具名称',
          dataIndex: 'chineseName',
          align: 'center',
          key: 'toolName'
        },
        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          align: 'center',
        },
        {
          title: '出库单编号',
          dataIndex: 'outNum',
          align: 'center',
        },
        {
          title: '出库类型',
          dataIndex: 'outStorehouseTypeName',
          align: 'center',
        },
        {
          title: '出库方式',
          dataIndex: 'operateType',
          align: 'center',
        },
        {
          title: '经手人',
          dataIndex: 'handler',
          align: 'center',
        },
        {
          title: '出库时间',
          dataIndex: 'outboundTime',
          align: 'center',
        },
        {
          title: '出库数量',
          dataIndex: 'outNumber',
          align: 'center',
        }
      ],
      para:{},
    }
  },

  methods: {
   
  },
  mounted() {
    this.$bus.$on('getToolLedgerData', (data) => {
      this.queryParam.toolCode = data.toolCode;
      this.searchQuery();
    })
  }
}
</script>

<style scoped>
@import '~@assets/less/common.less';
</style>

 src/views/tms/modules/toolLedger/StocktakingList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,126 @@
<template>
  <a-card
    :bordered="false"
    class="card-area"
  >
    <a-table
      ref="table"
      bordered
      size="middle"
      rowKey="id"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
      @change="handleTableChange"
    >
    </a-table>
  </a-card>
</template>

<script>
import { requestPut } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'

export default {
  name: 'ToolLedgerDetailList',
  mixins: [JeecgListMixin],
  components: {},
  data() {
    return {
      url: {
        list: '/tms/toolsStocktakingBound/toolsStocktakingList',
      },
      queryParam: {},
      nodeType: 0,
      dataSource: [],
      disableMixinCreated:true,
      columns: [
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolCode',
          width: '10%',
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'onlyCode',
          width: '10%',
        },
        {
          title: '工具名称',
          dataIndex: 'chineseName',
          align: 'center',
          key: 'toolName'
        },
        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          align: 'center',
        },
        {
          title: '盘点单号',
          dataIndex: 'orderCode',
          align: 'center',
        },
        {
          title: '盘点名称',
          dataIndex: 'stocktakingName',
          align: 'center',
        },
        {
          title: '盘点类型',
          dataIndex: 'stocktakingType',
          align: 'center',
        },
        {
          title: '经手人',
          dataIndex: 'handler',
          align: 'center',
        },
        {
          title: '盘库时间',
          dataIndex: 'stocktakingDate',
          align: 'center',
        },
        {
          title: '盘盈盘亏',
          dataIndex: 'surplusDeficit',
          align: 'center',
        },
        {
          title: '账面数量',
          dataIndex: 'bookQuantity',
          align: 'center',
        },
        {
          title: '可用数量',
          dataIndex: 'availableQuantity',
          align: 'center',
        },
        {
          title: '实盘数量',
          dataIndex: 'practicalQuantity',
          align: 'center',
        }
      ],
      para:{},
    }
  },

  methods: {
   
  },
  mounted() {
    this.$bus.$on('getToolLedgerData', (data) => {
      this.queryParam.toolCode = data.toolCode;
      this.searchQuery();
    })
  }
}
</script>

<style scoped>
@import '~@assets/less/common.less';
</style>

 src/views/tms/modules/toolLedger/ToolLedgerDetailList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,85 @@
<template>
  <a-card
    :bordered="false"
    class="card-area"
  >
    <a-table
      ref="table"
      bordered
      size="middle"
      rowKey="id"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
      @change="handleTableChange"
    >
    </a-table>
  </a-card>
</template>

<script>
import { requestPut } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'

export default {
  name: 'ToolLedgerDetailList',
  mixins: [JeecgListMixin],
  components: {},
  data() {
    return {
      url: {
        list: '/tms/toolLedgerDetail/queryToolLedgerDetailList',
      },
      queryParam: {},
      nodeType: 0,
      dataSource: [],
      disableMixinCreated:true,
      columns: [
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolCode',
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'onlyCode',
        },
        {
          title: '工具名称',
          dataIndex: 'chineseName',
          align: 'center',
          key: 'toolName'
        },
        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          align: 'center',
        },
      
        {
          title: '工具分类',
          dataIndex: 'applicationType',
          align: 'center',
        }
      ],
      para:{},
    }
  },

  methods: {
   
  },
  mounted() {
    this.$bus.$on('getToolLedgerData', (data) => {
      this.queryParam.toolCode = data.toolCode;
      this.searchQuery();
    })
  }
}
</script>

<style scoped>
@import '~@assets/less/common.less';
</style>

 src/views/tms/modules/toolLedger/ToolLedgerListLeft.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,323 @@
<template>
  <a-card
    :loading="cardLoading"
    :bordered="false"
    title="工具信息"
    style="height: 100%;"
  >
    <a-spin :spinning="loading">
      <a-alert
        type="info"
        :showIcon="true"
        style="margin-right: 54px;"
      >
        <div slot="message">
          å½“前：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
          <a
            v-if="this.currSelected.title"
            style="margin-left: 10px"
            @click="onClearSelected"
          >取消</a>
        </div>
      </a-alert>
      <!-- <div class="drawer-bootom-button">
        <a-dropdown
          :trigger="['click']"
          placement="bottomCenter"
        >
          <a-menu slot="overlay">
            <a-menu-item
              key="1"
              @click="expandAll"
            >展开所有</a-menu-item>
            <a-menu-item
              key="2"
              @click="closeAll"
            >合并所有</a-menu-item>
            <a-menu-item
              key="3"
              @click="refreshTree"
            >刷新</a-menu-item>
          </a-menu>
          <a-button>
            <a-icon type="bars" />
          </a-button>
        </a-dropdown>
      </div> -->

      <a-input-search
        @search="handleSearch"
        style="width:100%;margin-top: 10px"
        placeholder="检索工具分类"
        allowClear
        v-model="searchInput"
        @change="handleChange"
      />

      <!-- showLine -->
      <a-tree
        :checkStrictly="checkStrictly"
      
        :selectedKeys="selectedKeys"
        :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
        :treeData="treeDataSource"
        
        :defaultExpandAll="true"
        @select="onSelect"
        @expand="onExpand"
      >
        <template
          slot="title"
          slot-scope="{title, type, rfield1}"
        >
          <Tooltip
            placement="top"
            title="工具分类"
          >
            <i
              v-if="type == 0"
              class="action-jeecg actioncompany2"
              style="font-size: 18px;"
            />
          </Tooltip>

          <span v-if="title.indexOf(searchValue) > -1">
            {{ title.substr(0, title.indexOf(searchValue)) }}
            <span class="replaceSearch">{{ searchValue }}</span>
            {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
          </span>
          <span v-else>{{ title }}</span>
      
        </template>
      </a-tree>
    </a-spin>
  </a-card>
</template>

<script>
import { getAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
export default {
  name: 'ToolLedgerListLeft',
  components: {
    Tooltip,
  },
  props: ['value'],
  data() {
    return {
      searchInput: '',
      cardLoading: false,
      loading: false,
      treeDataSource: [],
      selectedKeys: [],
      expandedKeys: [],
      url: {
        factoryTreeList: '/tms/toolsClassify/loadTree',
      },
      searchValue: '',
      dataList: [],
      autoExpandParent: true,
      checkStrictly: true,
      allTreeKeys: [],
      currSelected: {},
      hiding: false,
    }
  },
  created() {
    this.queryTreeData();
    this.closeAll();
  },
  methods: {
    getCurrSelectedTitle() {
      return !this.currSelected.title ? '' : this.currSelected.title;
    },
    onClearSelected() {
      this.hiding = true;
      this.currSelected = {};
      this.selectedKeys = [];
    },
    onSelect(selectedKeys, e) {
      this.hiding = false;
      let record = e.node.dataRef;
      this.currSelected = Object.assign({}, record);
      this.selectedKeys = [record.key];
    },
    onExpand(expandedKeys) {
      this.expandedKeys = expandedKeys;
      this.autoExpandParent = false;
    },
    queryTreeData() {
      this.loading = true;
      this.cardLoading = true;
      getAction(this.url.factoryTreeList).then((res) => {
        if (res.success) {
          this.dataList = [];
          this.allTreeKeys = [];
          this.treeDataSource = res.result;
          this.generateList(res.result);
        } else {
          this.$message.warn(res.message);
        }
      }).finally(() => {
        this.loading = false;
        this.cardLoading = false;
      })
    },

    handleChange() {
      let search = this.searchInput;
      let expandedKeys = this.dataList
        .map(item => {
          if (item.title.indexOf(search) > -1) {
            return this.getParentKey(item.key, this.treeDataSource);
          }
          return null;
        })
        .filter((item, i, self) => item && self.indexOf(item) === i);
      Object.assign(this, {
        expandedKeys,
        searchValue: search,
        autoExpandParent: true,
      });
    },
    handleSearch(value) {
      let search = value;
      let expandedKeys = this.dataList
        .map(item => {
          if (item.title.indexOf(search) > -1) {
            return this.getParentKey(item.key, this.treeDataSource);
          }
          return null;
        })
        .filter((item, i, self) => item && self.indexOf(item) === i);
      Object.assign(this, {
        expandedKeys,
        searchValue: search,
        autoExpandParent: true,
      });
    },
    getParentKey(key, tree) {
      let parentKey;
      for (let i = 0; i < tree.length; i++) {
        const node = tree[i];
        if (node.children) {
          if (node.children.some(item => item.key === key)) {
            parentKey = node.key;
          } else if (
            this.getParentKey(key, node.children)) {
            parentKey = this.getParentKey(key, node.children);
          }
        }
      }
      return parentKey;
    },

    generateList(data) {
      for (let i = 0; i < data.length; i++) {
        const node = data[i];
        const key = node.key;
        const title = node.title;
        this.dataList.push({ key, title: title });
        this.allTreeKeys.push(key);
        if (node.children) {
          this.generateList(node.children);
        }
      }
    },
    expandAll() {
      this.expandedKeys = this.allTreeKeys;
    },
    closeAll() {
      this.expandedKeys = [];
    },
    refreshTree() {
      this.queryTreeData();
    }
  },
  mounted() {
    this.$bus.$on('queryTreeData', this.queryTreeData);
  },
  //监听
  watch: {
    currSelected(val) {//监听currSelected å˜åŒ–，将变化后的数值传递给 getCurrSelected äº‹ä»¶
      this.$bus.$emit('getCurrSelected', val)
    },
  }
}
</script>

<style scoped>
.replaceSearch {
  color: #40a9ff;
  font-weight: bold;
  background-color: rgb(204, 204, 204);
}
/*隐藏树的默认icon*/
.ant-tree-switcher-noop {
  display: none !important;
}
/*隐藏树的默认竖线*/
.ant-tree.ant-tree-show-line li:not(:last-child):before {
  border-left: 0px;
}

.ant-card-body .table-operator {
  margin: 15px;
}

.anty-form-btn {
  width: 100%;
  text-align: center;
}

.anty-form-btn button {
  margin: 0 5px;
}

.anty-node-layout .ant-layout-header {
  padding-right: 0;
}

.header {
  padding: 0 8px;
}

.header button {
  margin: 0 3px;
}

.ant-modal-cust-warp {
  height: 100%;
}

.ant-modal-cust-warp .ant-modal-body {
  height: calc(100% - 110px) !important;
  overflow-y: auto;
}

.ant-modal-cust-warp .ant-modal-content {
  height: 90% !important;
  overflow-y: hidden;
}

#app .desktop {
  height: auto !important;
}

/** Button按钮间距 */
.ant-btn {
  margin-left: 3px;
}
.ant-alert {
  padding: 5px 15px 5px 37px;
}
.drawer-bootom-button {
  position: absolute;
  top: 1px;
  /* padding: 10px 16px; */
  text-align: left;
  right: 0;
  background: #fff;
  border-radius: 0 0 2px 2px;
}
</style>

 src/views/tms/modules/toolLedger/ToolLedgerListRight.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,516 @@
<template>
  <a-card :bordered="false">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
           <a-col
            :md="6"
            :sm="8"
          >
            <a-form-item
              label="工具编号"
              :labelCol="{span: 5}"
              :wrapperCol="{span: 18, offset: 1}"
            >
              <a-input
                placeholder="请输入工具编号检索"
                v-model="queryParam.toolCode"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="8"
          >
            <a-form-item
              label="型号/图号"
              :labelCol="{span: 5}"
              :wrapperCol="{span: 18, offset: 1}"
            >
              <a-input
                placeholder="请输入型号/图号检索"
                v-model="queryParam.toolModel"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
            </span>
          </a-col>

        </a-row>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->

    <!-- table区域-begin -->
    <div>

      <a-table
        ref="table"
        size="middle"
        :scroll="{x:true}"
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
        class="j-table-force-nowrap"
        :customRow="customRow"
        @change="handleTableChange">

        <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;"/>
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)">
            ä¸‹è½½
          </a-button>
        </template>
      </a-table>
    </div>

     <a-tabs defaultActiveKey="1">
      <a-tab-pane key="1">
        <span slot="tab">
          <a-badge>参数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <para-hole-tools-list ref="paraHoleToolsList"></para-hole-tools-list>
        <para-threading-tool-list ref="paraThreadingToolList"></para-threading-tool-list>
        <para-mill-tool-list ref="paraMillToolList"></para-mill-tool-list>
        <para-turning-tools-list ref="paraTurningToolsList"></para-turning-tools-list>
        <para-blade-list ref="paraBladeList"></para-blade-list>
        <para-common-tool-list ref="paraCommonToolList"></para-common-tool-list>
      </a-tab-pane>

      <a-tab-pane
        key="2"
        forceRender
      >
        <span slot="tab">
          <a-badge>管理参数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <tools-config-property-list ref="toolsConfigPropertyList"></tools-config-property-list>
      </a-tab-pane>

      <a-tab-pane
        key="3"
        forceRender
      >
        <span slot="tab">
          <a-badge>把号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <tool-ledger-detail-list ref="toolLedgerDetailList"></tool-ledger-detail-list>
      </a-tab-pane>

      <a-tab-pane
        key="4"
        forceRender
      >
        <span slot="tab">
          <a-badge>入库信息&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <in-store-detail-list ref="inStoreDetailList"></in-store-detail-list>
      </a-tab-pane>

      <a-tab-pane
        key="5"
        forceRender
      >
        <span slot="tab">
          <a-badge>出库信息&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <out-store-detail-list ref="outStoreDetailList"></out-store-detail-list>
      </a-tab-pane>

      <a-tab-pane
        key="6"
        forceRender
      >
        <span slot="tab">
          <a-badge>刃磨信息&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <tool-sharpen-list ref="toolSharpenList"></tool-sharpen-list>
      </a-tab-pane>

      <a-tab-pane
        key="7"
        forceRender
      >
        <span slot="tab">
          <a-badge>报损信息&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <tool-loss-list ref="toolLossList"></tool-loss-list>
      </a-tab-pane>

      <a-tab-pane
        key="8"
        forceRender
      >
        <span slot="tab">
          <a-badge>盘点信息&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <stocktaking-list ref="stocktakingList"></stocktaking-list>
      </a-tab-pane>
    </a-tabs>
  </a-card>
</template>

<script>

  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import Tooltip from 'ant-design-vue/es/tooltip'
  import { getAction, postAction, deleteAction, requestPut } from '@api/manage'
  import ParaHoleToolsList from '../baseTools/ParaHoleToolsList'
  import ToolsConfigPropertyList from '../baseTools/ToolsConfigPropertyList'
  import ParaMillToolList from '../baseTools/ParaMillToolList'
  import ParaThreadingToolList from '../baseTools/ParaThreadingToolList'
  import ParaTurningToolsList from '../baseTools/ParaTurningToolsList'
  import ParaCommonToolList from '../baseTools/ParaCommonToolList'
  import ParaBladeList from '../baseTools/ParaBladeList'
  import ToolLedgerDetailList from './ToolLedgerDetailList'
  import ToolLossList from './ToolLossList'
  import ToolSharpenList from './ToolSharpenList'
  import StocktakingList from './StocktakingList'
  import InStoreDetailList from './InStoreDetailList'
  import OutStoreDetailList from './OutStoreDetailList'

  export default {
    name: 'ToolLedgerListRight',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      Tooltip,
      ParaHoleToolsList,
      ToolsConfigPropertyList,
      ParaMillToolList,
      ParaThreadingToolList,
      ParaTurningToolsList,
      ParaCommonToolList,
      ParaBladeList,
      ToolLedgerDetailList,
      ToolLossList,
      ToolSharpenList,
      StocktakingList,
      InStoreDetailList,
      OutStoreDetailList
    },
    data () {
      return {
        description: '工具台账信息管理页面',
        /* åˆ†é¡µå‚æ•° */
      ipagination:{
        current: 1,
        pageSize: 10,
        pageSizeOptions: ['10', '20', '50'],
        showTotal: (total, range) => {
          return range[0] + "-" + range[1] + " å…±" + total + "条"
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'工具编码',
            align:"center",
            dataIndex: 'toolCode'
          },
          {
            title:'序号',
            align:"center",
            dataIndex: 'signCode'
          },
          {
            title:'中文名称',
            align:"center",
            dataIndex: 'chineseName'
          },
          // {
          //   title:'外文名称',
          //   align:"center",
          //   dataIndex: 'foreignLanguageName'
          // },
          // {
          //   title:'标注级别',
          //   align:"center",
          //   dataIndex: 'standardLevel'
          // },
          // {
          //   title:'标准号',
          //   align:"center",
          //   dataIndex: 'standardCode'
          // },
          {
            title:'型号/图号',
            align:"center",
            dataIndex: 'toolModel'
          },
          {
            title:'工具类型',
            align:"center",
            dataIndex: 'applicationType'
          },
          {
            title:'管理等级',
            align:"center",
            dataIndex: 'accuracyClass'
          },
          {
            title:'存储位置',
            align:"center",
            dataIndex: 'storageLocation'
          },
          {
            title:'库位号',
            align:"center",
            dataIndex: 'positionCode'
          },
          {
            title:'最低库存',
            align:"center",
            dataIndex: 'lowerInventory'
          },
          {
            title:'最高库存',
            align:"center",
            dataIndex: 'highestInventory'
          },
          {
            title:'总库存',
            align:"center",
            dataIndex: 'totalCount'
          },
          {
            title:'可用库存',
            align:"center",
            dataIndex: 'availableCount'
          },
          {
            title:'报损',
            align:"center",
            dataIndex: 'lossCount'
          },
          {
            title:'在借',
            align:"center",
            dataIndex: 'lendCount'
          },
          {
            title:'在磨',
            align:"center",
            dataIndex: 'sharpeningCount'
          },
          {
            title:'在检',
            align:"center",
            dataIndex: 'detectionCount'
          },
          {
            title:'在修',
            align:"center",
            dataIndex: 'repairCount'
          }
          // {
          //   title:'备注',
          //   align:"center",
          //   dataIndex: 'remark'
          // }
          // {
          //   title:'创建人',
          //   align:"center",
          //   dataIndex: 'createBy'
          // },
          // {
          //   title:'创建时间',
          //   align:"center",
          //   dataIndex: 'createTime',
          //   customRender:function (text) {
          //     return !text?"":(text.length>10?text.substr(0,10):text)
          //   }
          // }
        ],
        url: {
          list: "/tms/baseTools/list",
          paraHolesToolsList:"/tms/baseTools/paraHolesToolsList",
          paraCommonToolList:"/tms/baseTools/paraCommonToolList",
          paraThreadingToolList:"/tms/baseTools/paraThreadingToolList",
          paraMillToolList:"/tms/baseTools/paraMillToolList",
          paraTurningToolsList:"/tms/baseTools/paraTurningToolsList",
          paraBladeList:"/tms/baseTools/paraBladeList",
          delete: "/tms/baseTools/delete",
          deleteBatch: "/tms/baseTools/deleteBatch",
          edit: '/tms/baseTools/edit',
          exportXlsUrl: "/tms/baseTools/exportXls",
          importExcelUrl: "tms/baseTools/importExcel",
          queryParaByToolCode:"/tms/baseTools/queryByToolCode",
          queryByToolCode:"/tms/toolsConfigProperty/queryByToolCode",
          toolLedgerList:"/tms/toolLedger/toolLedgerList",
          toolLedgerDetailList:"/tms/toolLedgerDetail/list"
        },
        dictOptions:{},
        superFieldList:[],
        nodeSelected: {}, // å½“前选中的节点数据
        paraTypeFlag:'',
        disableMixinCreated:true
      }
    },
    created() {
      this.$bus.$on('getCurrSelected', (data) => {
      //getCurrSelected äº‹ä»¶ æŽ¥æ”¶ç»„件传递的参数
      this.nodeType = (data.type == undefined ? 0 : data.type);
      this.paraTypeFlag = (data.entity == undefined ? 0 : data.entity.paraTypeFlag)
      this.nodeSelected = data;
      this.loadData()
      this.clearPara()
    })
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      },
    },
    methods: {

      modalFormOk() {
        this.loadData(); // åˆ·æ–°è¡¨æ ¼æ•°æ®
        this.$bus.$emit('queryTreeData') //刷新左侧树
      },

      onSelectChange(selectedRowKeys,selectionRows) {
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows
        //通过id查询管理参数和参数数据
        getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.paraTypeFlag}).then((res) => {
          if (res.success) {
            if(this.paraTypeFlag === "1"){
              this.$refs.paraCommonToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "2"){
              this.$refs.paraHoleToolsList.getPara(res.result);
            }else if(this.paraTypeFlag === "3"){
              this.$refs.paraThreadingToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "4"){
              this.$refs.paraMillToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "5"){
              this.$refs.paraTurningToolsList.getPara(res.result);
            }else if(this.paraTypeFlag === "6"){
              this.$refs.paraBladeList.getPara(res.result);
            }
          } else {
            this.$message.warning(res.message);
          }
        })
        getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0]}).then((res) => {
          if (res.success) {
            this.$refs.toolsConfigPropertyList.getPara(res.result);
          } else {
            this.$message.warning(res.message);
          }
        })
        this.$bus.$emit('getToolLedgerData', this.selectionRows[0])
      },
      //禁用状态样式
      tableRowClass(record, index) {
        if (record.status != "1") {
          return "frozenRowClass";
        }
        return "";
      },
      loadData() {
        let params = this.getQueryParams();
        if (this.nodeSelected && this.nodeSelected.key !== '-1') {
          // åŠ è½½é€‰ä¸­èŠ‚点的子类
          params.classifyId = this.nodeSelected.key;
          this.loading = true;
        let httpUrl = this.url.toolLedgerList
        getAction(httpUrl, params)
          .then((res) => {
            if (res.success) {
              this.dataSource = res.result.records; // æ›´æ–°è¡¨æ ¼æ•°æ®
              this.ipagination.total = res.result.total
            } else {
              this.$message.warning("请选择叶子节点进行查询");
              this.ipagination.total = 0
            }
          })
          .finally(() => {
            this.loading = false;
          });
        } else {
          this.$message.warning("请选择叶子节点进行查询");
        }
      },
      onClearSelected() {
        this.selectedKeys = [];
        this.nodeSelected = {}; // æ¸…空选中的节点
        this.dataSource = []; // æ¸…空表格数据
      },
      //重置
      searchReset() {
        this.queryParam = {}
        this.loadData(1);
        this.clearPara()
      },
      //清空选中及参数
      clearPara(){
        this.selectedRowKeys = []   
        this.$refs.paraCommonToolList.visable = false
        this.$refs.paraHoleToolsList.visable = false
        this.$refs.paraThreadingToolList.visable = false   
        this.$refs.paraMillToolList.visable = false    
        this.$refs.paraTurningToolsList.visable = false
        this.$refs.paraBladeList.visable = false
        this.$refs.toolsConfigPropertyList.visable = false
      },
      customRow(record) {
        return {
          on: {
            click: () => {
              this.onSelectChange(record.id.split(","), [record]);
            }
          }
        }
      },
      
    },
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';
   .enable {
    color: green;
  }
  .disable {
    color: red;
  }
</style>

 src/views/tms/modules/toolLedger/ToolLossList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,106 @@
<template>
  <a-card
    :bordered="false"
    class="card-area"
  >
    <a-table
      ref="table"
      bordered
      size="middle"
      rowKey="id"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
      @change="handleTableChange"
    >
    </a-table>
  </a-card>
</template>

<script>
import { requestPut } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'

export default {
  name: 'ToolLossList',
  mixins: [JeecgListMixin],
  components: {},
  data() {
    return {
      url: {
        list: '/tms/toolsLossBound/toolLossDetailList',
      },
      queryParam: {},
      nodeType: 0,
      dataSource: [],
      disableMixinCreated:true,
      columns: [
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolCode',
          width: '10%',
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'onlyCode',
          width: '10%',
        },
        {
          title: '工具名称',
          dataIndex: 'chineseName',
          align: 'center',
          key: 'toolName'
        },
        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          align: 'center',
        },
        {
          title: '报损单号',
          dataIndex: 'orderCode',
          align: 'center',
        },
        {
          title: '经手人',
          dataIndex: 'handler',
          align: 'center',
        },
        {
          title: '报损原因',
          dataIndex: 'lossReason',
          align: 'center',
        },
        {
          title: '报损时间',
          dataIndex: 'lossTime',
          align: 'center',
        },
        {
          title: '报损数量',
          dataIndex: 'lossNumber',
          align: 'center',
        }
      ],
      para:{},
    }
  },

  methods: {
   
  },
  mounted() {
    this.$bus.$on('getToolLedgerData', (data) => {
      this.queryParam.toolCode = data.toolCode;
      this.searchQuery();
    })
  }
}
</script>

<style scoped>
@import '~@assets/less/common.less';
</style>

 src/views/tms/modules/toolLedger/ToolSharpenList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,101 @@
<template>
  <a-card
    :bordered="false"
    class="card-area"
  >
    <a-table
      ref="table"
      bordered
      size="middle"
      rowKey="id"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
      @change="handleTableChange"
    >
    </a-table>
  </a-card>
</template>

<script>
import { requestPut } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'

export default {
  name: 'ToolSharpenList',
  mixins: [JeecgListMixin],
  components: {},
  data() {
    return {
      url: {
        list: '/tms/toolSharpening/toolSharpeningList',
      },
      queryParam: {},
      nodeType: 0,
      dataSource: [],
      disableMixinCreated:true,
      columns: [
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolCode',
          width: '10%',
        },
        {
          title: '工具编号',
          align: 'center',
          dataIndex: 'onlyCode',
          width: '10%',
        },
        {
          title: '工具名称',
          dataIndex: 'chineseName',
          align: 'center',
          key: 'toolName'
        },
        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          align: 'center',
        },
        {
          title: '责任人',
          dataIndex: 'toolModel',
          align: 'center',
        },
        {
          title: '刃磨时间',
          dataIndex: 'toolModel',
          align: 'center',
        },
        {
          title: '刃磨结果及建议',
          dataIndex: 'toolModel',
          align: 'center',
        },
        {
          title: '刃磨状态',
          dataIndex: 'toolModel',
          align: 'center',
        },
      ],
      para:{},
    }
  },

  methods: {
   
  },
  mounted() {
    this.$bus.$on('getToolLedgerData', (data) => {
      this.queryParam.toolCode = data.toolCode;
      this.searchQuery();
    })
  }
}
</script>

<style scoped>
@import '~@assets/less/common.less';
</style>

 src/views/tms/modules/toolsClassify/ToolsClassifyListLeft.vue

@@ -227,7 +227,7 @@
      this.expandedKeys = this.allTreeKeys;
    },
    closeAll() {
      this.expandedKeys = this.allSiteIds;
      this.expandedKeys = [];
    },
    refreshTree() {
      this.queryTreeData();