合并冲突

licp

2024-04-03 67d2338b3dd43c5972159822aa3dd8f53cd3c78b

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

@@ -56,21 +56,15 @@
         </div>
         <div class="search">
            <div class="search_thing">
               <div class="search_label">样品名称：</div>
          <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>
              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_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>
            <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">
@@ -111,11 +105,10 @@
            componentData: {
               entity: {
                  entrustCode: null,
                  sample: null,
                  state: 1,
            code: null,
                  orderBy: {
                     field: 'id',
                     order: 'asc'
              order: 'desc'
                  }
               },
               isIndex: true,
@@ -127,36 +120,36 @@
                  type: 'text',
                  method: 'handleWeave',
                  disabFun: (row, index) => {
                     return row.state != 1
              return row.isExamine != null
                  }
               }, {
                  id: 'download',
                  font: '下载',
                  type: 'text',
                  method: 'download',
                  disabFun: (row, index) => {
                     return row.state != 1
                  }
            method: 'download'
               }, {
                  id: 'handleUpload',
                  font: '上传',
                  type: 'text',
                  method: 'handleUpload',
                  disabFun: (row, index) => {
                     return row.state != 0
              return row.isExamine != null
                  }
               }, {
                  id: 'handlRestore',
                  font: '还原',
                  type: 'text',
                  method: 'handleRestore'
            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
              return row.isExamine != null
                  }
               }, {
            id: 'handleApprove',
@@ -164,32 +157,36 @@
                  type: 'text',
                  method: 'handleApprove',
                  disabFun: (row, index) => {
                     return row.state != 1 || row.sendTime != null
              return row.isRatify != null
                  }
               }],
               linkEvent:{
                 entrustCode:{
            code: {
                   method:'selectAllByOne'
                 }
               },
               tagField: {
                  type: {
            isRatify: {
                     select: [{
                        value: 0,
                        type: 'success',
                        label: '普通'
                type: 'danger',
                label: '不批准'
                     }, {
                        value: 1,
                        type: 'warning',
                        label: '优先'
                     }, {
                        value: 2,
                        type: 'danger',
                        label: '紧急'
                type: 'success',
                label: '批准'
                     }]
                  },
                  createUser: {
                     select: []
            isExamine: {
              select: [{
                value: 0,
                type: 'danger',
                label: '不通过'
              }, {
                value: 1,
                type: 'success',
                label: '通过'
              }]
                  }
               },
               selectField: {},
@@ -204,17 +201,11 @@
        value:''
         }
      },
    watch:{
      claimVisible(val){
        this.fullscreen = false;
      }
    },
      mounted() {
         this.entityCopy = this.HaveJson(this.componentData.entity)
         this.getPower()
      },
      methods: {
      // ...convertFileToHtml(),
         refreshTable() {
            this.$refs['ValueTable'].selectList()
         },
@@ -247,7 +238,10 @@
            this.upLoad = false;
         },
      confirmClaim(){
        console.log(11111111111,this.$refs.Word.getValue())
        console.log(this.$refs.Word.getValue())
      },
      selectAllByOne(row){
        console.log(row);
      }
      }
   }