合并冲突

licp

2024-04-03 67d2338b3dd43c5972159822aa3dd8f53cd3c78b

 src/components/view/b1-report-preparation.vue

@@ -1,39 +1,39 @@
<style scoped>
   .title {
      height: 60px;
      line-height: 60px;
   }
  .title {
    height: 60px;
    line-height: 60px;
  }

   .search {
      background-color: #fff;
      height: 80px;
      display: flex;
      align-items: center;
   }
  .search {
    background-color: #fff;
    height: 80px;
    display: flex;
    align-items: center;
  }

   .search_thing {
      display: flex;
      align-items: center;
      height: 50px;
   }
  .search_thing {
    display: flex;
    align-items: center;
    height: 50px;
  }

   .search_label {
      width: 120px;
      font-size: 14px;
      text-align: right;
   }
  .search_label {
    width: 120px;
    font-size: 14px;
    text-align: right;
  }

   .search_input {
      width: calc(100% - 120px);
   }
  .search_input {
    width: calc(100% - 120px);
  }

   .table {
      margin-top: 10px;
      background-color: #fff;
      width: calc(100% - 40px);
      height: calc(100% - 60px - 80px - 10px - 40px);
      padding: 20px;
   }
  .table {
    margin-top: 10px;
    background-color: #fff;
    width: calc(100% - 40px);
    height: calc(100% - 60px - 80px - 10px - 40px);
    padding: 20px;
  }

   .el-form-item {
      margin-bottom: 16px;
@@ -47,30 +47,24 @@
</style>

<template>
   <div class="inspection_order">
      <div style="width: 100%;height: 100%;">
         <div>
            <el-row class="title">
               <el-col :span="12" style="padding-left: 20px;">报告编制</el-col>
            </el-row>
         </div>
         <div class="search">
            <div class="search_thing">
               <div class="search_label">样品名称：</div>
               <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                     v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
               <div class="search_label">状态：</div>
               <div class="search_input">
          <el-select v-model="componentData.entity.status" placeholder="全部" size="small">
            <el-option
              v-for="item in statusList"
              :key="item.value"
              :label="item.label"
              :value="item.value">
            </el-option>
          </el-select>
  <div class="inspection_order">
    <div style="width: 100%;height: 100%;">
      <div>
        <el-row class="title">
          <el-col :span="12" style="padding-left: 20px;">报告编制</el-col>
        </el-row>
      </div>
      <div class="search">
        <div class="search_thing">
          <div class="search_label">报告编号：</div>
          <div class="search_input"><el-input size="small" placeholder="请输入" clearable
              v-model="componentData.entity.code" @keyup.enter.native="refreshTable()"></el-input></div>
        </div>
        <div class="search_thing">
          <div class="search_label">委托编号：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.entrustCode"
              @keyup.enter.native="refreshTable()"></el-input>
          </div>
            </div>
            <div class="search_thing" style="padding-left: 30px;">
@@ -79,8 +73,8 @@
            </div>
         </div>
         <div class="table">
            <ValueTable ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
               :key="upIndex" @handleWeave="handleWeave"/>
            <ValueTable ref="ValueTable" :url="$api.insReport.pageInsReport" :componentData="componentData"
               :key="upIndex"/>
         </div>
      </div>
    <el-dialog title="在线编制" :visible.sync="claimVisible" width="25cm" :modal-append-to-body="false" :fullscreen="fullscreen">
@@ -98,157 +92,157 @@
</template>

<script>
   import ValueTable from '../tool/value-table.vue'
  import ValueTable from '../tool/value-table.vue'
  import Word from '../tool/word.vue'
  // import convertFileToHtml from '../../util/file';
   export default {
      components: {
         ValueTable,
      Word,
      },
      data() {
         return {
            componentData: {
               entity: {
                  entrustCode: null,
                  sample: null,
                  state: 1,
                  orderBy: {
                     field: 'id',
                     order: 'asc'
                  }
               },
               isIndex: true,
               showSelect: false,
               select: false,
               do: [{
                  id: 'handleWeave',
                  font: '在线编制',
                  type: 'text',
                  method: 'handleWeave',
                  disabFun: (row, index) => {
                     return row.state != 1
                  }
               }, {
                  id: 'download',
                  font: '下载',
                  type: 'text',
                  method: 'download',
                  disabFun: (row, index) => {
                     return row.state != 1
                  }
               }, {
                  id: 'handleUpload',
                  font: '上传',
                  type: 'text',
                  method: 'handleUpload',
                  disabFun: (row, index) => {
                     return row.state != 0
                  }
               }, {
                  id: 'handlRestore',
                  font: '还原',
                  type: 'text',
                  method: 'handleRestore'
               }, {
    },
    data() {
      return {
        componentData: {
          entity: {
            entrustCode: null,
            code: null,
            orderBy: {
              field: 'id',
              order: 'desc'
            }
          },
          isIndex: true,
          showSelect: false,
          select: false,
          do: [{
            id: 'handleWeave',
            font: '在线编制',
            type: 'text',
            method: 'handleWeave',
            disabFun: (row, index) => {
              return row.isExamine != null
            }
          }, {
            id: 'download',
            font: '下载',
            type: 'text',
            method: 'download'
          }, {
            id: 'handleUpload',
            font: '上传',
            type: 'text',
            method: 'handleUpload',
            disabFun: (row, index) => {
              return row.isExamine != null
            }
          }, {
            id: 'handlRestore',
            font: '还原',
            type: 'text',
            method: 'handleRestore',
            disabFun: (row, index) => {
              return row.isExamine != null
            }
          }, {
            id: 'handleIssued',
                  font: '审核',
                  type: 'text',
                  method: 'handleIssued',
                  disabFun: (row, index) => {
                     return row.state != 1 || row.sendTime != null
                  }
               }, {
            font: '审核',
            type: 'text',
            method: 'handleIssued',
            disabFun: (row, index) => {
              return row.isExamine != null
            }
          }, {
            id: 'handleApprove',
                  font: '批准',
                  type: 'text',
                  method: 'handleApprove',
                  disabFun: (row, index) => {
                     return row.state != 1 || row.sendTime != null
                  }
               }],
               linkEvent:{
                 entrustCode:{
                   method:'selectAllByOne'
                 }
               },
               tagField: {
                  type: {
                     select: [{
                        value: 0,
                        type: 'success',
                        label: '普通'
                     }, {
                        value: 1,
                        type: 'warning',
                        label: '优先'
                     }, {
                        value: 2,
                        type: 'danger',
                        label: '紧急'
                     }]
                  },
                  createUser: {
                     select: []
                  }
               },
               selectField: {},
               requiredAdd: [],
               requiredUp: []
            },
            entityCopy: {},
            upIndex: 0,
        statusList:[],
        claimVisible:false,
            font: '批准',
            type: 'text',
            method: 'handleApprove',
            disabFun: (row, index) => {
              return row.isRatify != null
            }
          }],
          linkEvent: {
            code: {
              method: 'selectAllByOne'
            }
          },
          tagField: {
            isRatify: {
              select: [{
                value: 0,
                type: 'danger',
                label: '不批准'
              }, {
                value: 1,
                type: 'success',
                label: '批准'
              }]
            },
            isExamine: {
              select: [{
                value: 0,
                type: 'danger',
                label: '不通过'
              }, {
                value: 1,
                type: 'success',
                label: '通过'
              }]
            }
          },
          selectField: {},
          requiredAdd: [],
          requiredUp: []
        },
        entityCopy: {},
        upIndex: 0,
        statusList: [],
        claimVisible: false,
        fullscreen:false,
        value:''
         }
      },
    watch:{
      claimVisible(val){
        this.fullscreen = false;
      }
    },
      mounted() {
         this.entityCopy = this.HaveJson(this.componentData.entity)
         this.getPower()
      },
      methods: {
      // ...convertFileToHtml(),
         refreshTable() {
            this.$refs['ValueTable'].selectList()
         },
         refresh() {
            this.componentData.entity = this.HaveJson(this.entityCopy)
            this.upIndex++
         },
      handleWeave(){
    mounted() {
      this.entityCopy = this.HaveJson(this.componentData.entity)
      this.getPower()
    },
    methods: {
      refreshTable() {
        this.$refs['ValueTable'].selectList()
      },
      refresh() {
        this.componentData.entity = this.HaveJson(this.entityCopy)
        this.upIndex++
      },
      handleWeave() {
        this.claimVisible = true;
      },
         // 权限分配
         getPower(radio) {
            let power = JSON.parse(sessionStorage.getItem('power'))
            let up = false
            let del = false
            let add = false
            for (var i = 0; i < power.length; i++) {
               if (power[i].menuMethod == 'upInsOrder') {
                  up = true
               }
               if (power[i].menuMethod == 'addInsOrder') {
                  add = true
               }
            }
            if (!up) {
               this.componentData.do.splice(4, 1)
            }
         },
         handleClose() {
            this.upLoad = false;
         },
      confirmClaim(){
        console.log(11111111111,this.$refs.Word.getValue())
      // 权限分配
      getPower(radio) {
        let power = JSON.parse(sessionStorage.getItem('power'))
        let up = false
        let del = false
        let add = false
        for (var i = 0; i < power.length; i++) {
          if (power[i].menuMethod == 'upInsOrder') {
            up = true
          }
          if (power[i].menuMethod == 'addInsOrder') {
            add = true
          }
        }
        if (!up) {
          this.componentData.do.splice(4, 1)
        }
      },
      handleClose() {
        this.upLoad = false;
      },
      confirmClaim() {
        console.log(this.$refs.Word.getValue())
      },
      selectAllByOne(row){
        console.log(row);
      }
      }
   }
    }
  }
</script>