Merge remote-tracking branch 'origin/master'

value

2024-05-27 6d2e054b221d145036710b1e4e7b3e417dcf07e9

 src/components/view/b1-inspection-order.vue

@@ -92,23 +92,23 @@
                     v-model="componentData.entity.sampleType" @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.sampleModel" @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.sampleType" @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.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
                     v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
        <div class="search_thing">
               <div class="search_label">下单时间：</div>
               <div class="search_input">
            <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
            type="datetime"
            type="date"
            size="small"
            format="yyyy-MM-dd"
            value-format="yyyy-MM-dd"
            value-format="yyyy-MM-dd HH:mm:ss"
            clearable
            placeholder="选择日期">
            </el-date-picker>
@@ -167,10 +167,10 @@
            </span>
         </el-dialog>
         <!-- 下发 -->
         <el-dialog title="检验下发" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
         <el-dialog title="检验分配" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
            <div class="body" style="max-height: 60vh;">
               <el-row>
                  <el-col class="search_thing" :span="22">
                  <el-col class="search_thing" style="width: 95%;">
                     <div class="search_label"><span class="required-span">* </span>约定时间：</div>
                     <div class="search_input">
                        <el-date-picker size="small" v-model="distributeData.appointed" type="date" placeholder="选择日期"
@@ -178,10 +178,10 @@
                        </el-date-picker>
                     </div>
                  </el-col>
                  <el-col class="search_thing" :span="22">
                  <el-col class="search_thing" style="width: 95%;">
                     <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>指派人员：</div>
                     <div class="search_input">
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;" clearable>
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;" clearable filterable>
                           <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
                           </el-option>
                        </el-select>
@@ -204,7 +204,8 @@
         </el-dialog>
      </div>
      <div style="width: 100%;height: 100%;" v-if="active >0">
         <Add :active="active" :currentId="currentId" />
         <Add :active="active" :currentId="currentId" v-if="active<4" />
      <fiberOpticConfig :currentId="currentId" v-if="active==4" />
      </div>
   </div>
</template>
@@ -212,10 +213,12 @@
<script>
   import ValueTable from '../tool/value-table.vue'
   import Add from '../do/b1-ins-order/add.vue'
  import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
   export default {
      components: {
         ValueTable,
         Add
         Add,
      fiberOpticConfig
      },
      data() {
         return {
@@ -242,6 +245,9 @@
               entity: {
                  entrustCode: null,
                  sampleType: null,
            sampleName: null,
            sampleModel: null,
            sampleCode: null,
                  state: 0,
                  orderBy: {
                     field: 'id',
@@ -423,7 +429,7 @@
               },
            ],
            tabIndex: 0,
            active: 0, //1：下单，2：查看，3：审核
            active: 4, //1：下单，2：查看，3：审核，4：光纤配置,默认为0
            currentId: null
         }
      },
@@ -506,13 +512,15 @@
         },
         // 下载报告
         download(row) {
        // console.log(row);
        let url = row.url;
        const link = document.createElement('a');
        link.href = this.javaApi + url;
        link.target = '_blank';
        document.body.appendChild(link);
        link.click();
        let url = row.urlS?row.urlS:row.url;
        if(url){
          url = url.split('.')[0]+'.pdf'
          const link = document.createElement('a');
          link.href = this.javaApi + url;
          link.target = '_blank';
          document.body.appendChild(link);
          link.click();
        }
      },
         // 审核
         handleVerify(row) {