licp
2024-07-26 41accbc320b74163a4d9450882677ff3ff0318d6
解决检验任务值不能输入的bug
已修改8个文件
已删除35个文件
11523 ■■■■■ 文件已修改
src/components/do/b1-inspect-order-plan/Inspection.vue 185 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-standard-material-requisition.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-expenses.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-report-preparation.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-unpass.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b3-classes.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/js/worker0.js 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/langs/zh_CN.js 417 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/content/dark/content.css 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/content/dark/content.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/content/default/content.css 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/content/default/content.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/content/document/content.css 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/content/document/content.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/content/writer/content.css 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/content/writer/content.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/content.css 714 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/content.inline.css 726 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/content.inline.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/content.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/content.mobile.css 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/content.mobile.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/skin.css 3047 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/skin.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/skin.mobile.css 673 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/skin.mobile.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/skin.shadowdom.css 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/content.css 732 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/content.inline.css 726 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/content.inline.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/content.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/content.mobile.css 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/content.mobile.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/skin.css 3047 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/skin.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/skin.mobile.css 673 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/skin.mobile.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/skin.shadowdom.css 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tinymce/skins/ui/oxide/skin.shadowdom.min.css 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -230,9 +230,9 @@
<template>
  <div v-loading="loading" class="inspection">
    <el-row class="title">
      <el-col :span="12" style="padding-left: 20px;text-align: left;">检验单详情
      <el-col :span="12" style="padding-left: 20px;text-align: left;" v-once>检验单详情
      </el-col>
      <el-col :span="12" style="text-align: right;">
      <el-col :span="12" style="text-align: right;" v-once>
        <!-- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">光纤切换</el-button>
        <el-button size="small" type="primary" @click="fiberOpticTapeVisible=true" v-if="fiberOpticTape.length>0">光纤带切换</el-button>
        <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">套管切换</el-button> -->
@@ -271,22 +271,22 @@
          <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="请输入"></el-input>
        </el-form-item>
        <el-form-item label="当前样品位数:">
          <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>
          <el-tag v-show="currentKey">{{ `NO.${currentKey}` }}</el-tag>
        </el-form-item>
      </el-form>
    </div>
    <div class="center">
      <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;">
        <div style="display: flex;align-items: center;">
          <span v-if="tableList.length>0">检验模板:</span>
          <span v-show="tableList.length>0">检验模板:</span>
          <el-radio-group v-model="currentTable" size="small">
            <el-radio-button :label="item.templateId" v-for="(item,index) in tableLists" :key="index"
              size="small">{{ item.templateName }}</el-radio-button>
          </el-radio-group>
        </div>
        <div style="display: flex;align-items: center;">
          <span v-if="fibers.length>0">&nbsp;&nbsp;光纤带:</span>
          <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,1)" v-if="fibers.length>0" size="small">
          <span v-show="fibers.length>0">&nbsp;&nbsp;光纤带:</span>
          <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,1)" v-show="fibers.length>0" size="small">
            <el-option
              v-for="item in fibers"
              :key="item.value"
@@ -296,8 +296,8 @@
              <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'已检':'未检' }}</el-tag>
            </el-option>
          </el-select>
          <span v-if="fiber.length>0">&nbsp;&nbsp;光纤:</span>
          <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,2)" v-if="fiber.length>0" size="small">
          <span v-show="fiber.length>0">&nbsp;&nbsp;光纤:</span>
          <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,2)" v-show="fiber.length>0" size="small">
            <el-option
              v-for="item in fiber"
              :label="item.bushColor+'-'+item.color"
@@ -307,7 +307,7 @@
              <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'已检':'未检' }}</el-tag>
            </el-option>
          </el-select>
          <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='检测中心'">
          <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-show="PROJECT=='检测中心'">
            <el-form-item label="温度:" style="margin-bottom: 0;">
              <el-input v-model="otherForm.temperature" :disabled="state>1" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')" ></el-input>
              <span style="margin-left: 4px;">℃</span>
@@ -317,8 +317,8 @@
              <span style="margin-left: 4px;">%</span>
            </el-form-item>
          </el-form>
          <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">数据采集</el-button>
          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button>
          <el-button type="primary" size="small" v-show="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">数据采集</el-button>
          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-show="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button>
        </div>
      </div>
      <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'&&tableLists.find(m=>m.templateId==currentTable).templateName!='热循环检验原始记录')">
@@ -326,7 +326,7 @@
          <tbody>
            <tr v-for="(m,i) in item.arr" :key="i">
              <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
                v-if="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
              v-show="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
                :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
                :style="`background:${n.v.bg?n.v.bg:''};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
                <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`"
@@ -352,12 +352,12 @@
                      v-else-if="getInspectionValueType(n.i) == 4">/</span>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='结论'">
                    <el-select v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state==1&&PROJECT=='装备电缆'"
                    <el-select v-show="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state==1&&PROJECT=='装备电缆'"
                      class="table_input" v-model="n.v.v" @change="saveInsContext()">
                      <el-option label="合格" :value="1"></el-option>
                      <el-option label="不合格" :value="0"></el-option>
                    </el-select>
                    <template v-if="PROJECT=='检测中心'||PROJECT=='装备电缆'&&getInspectionValueType(n.i) != 2 ">
                    <template v-show="PROJECT=='检测中心'||PROJECT=='装备电缆'&&getInspectionValueType(n.i) != 2 ">
                      <span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">合格</span>
                      <span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">不合格</span>
                      <span v-else :style="`font-family:${n.v.ff} !important;`">待定</span>
@@ -385,10 +385,10 @@
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='样品编号'">
                    <div style="display: flex;flex-wrap: nowrap;align-items: center;width: 100%" :title="currentSample.sampleCode">
                      <i class="el-icon-caret-left table_caret" style="width: 16px;" @click="caretSample(-1)" v-if="!currentFiberOpticTape&&!currentFiberOptic"></i>
                      <i class="el-icon-caret-left table_caret" style="width: 16px;" @click="caretSample(-1)" v-show="!currentFiberOpticTape&&!currentFiberOptic"></i>
                      <div :style="`font-family:${n.v.ff} !important;overflow: hidden;white-space: nowrap;width: calc(100% - 32px);`">{{currentSample.sampleCode}}</div>
                      <i class="el-icon-caret-right table_caret" style="width: 16px;"
                      v-if="!currentFiberOpticTape&&!currentFiberOptic"@click="caretSample(1)"></i>
                      v-show="!currentFiberOpticTape&&!currentFiberOptic"@click="caretSample(1)"></i>
                    </div>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='样品型号'">
@@ -404,24 +404,24 @@
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='光纤带'">
                    <div style="display: flex;flex-wrap: nowrap;align-items: center;">
                      <i class="el-icon-caret-left table_caret" @click="caretTape(-1)
                      " v-if="currentFiberOpticTape"></i>
                      " v-show="currentFiberOpticTape"></i>
                      <div :style="`font-family:${n.v.ff} !important;`">{{currentFiberOpticTape?currentFiberOpticTape.code:''}}</div>
                      <i class="el-icon-caret-right table_caret"
                      v-if="currentFiberOpticTape"
                      v-show="currentFiberOpticTape"
                      @click="caretTape(1)"></i>
                    </div>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='光纤'">
                    <div style="display: flex;flex-wrap: nowrap;align-items: center;">
                      <i class="el-icon-caret-left table_caret" @click="caretOptic(-1)"
                      v-if="currentFiberOptic"></i>
                      v-show="currentFiberOptic"></i>
                      <div :style="`font-family:${n.v.ff} !important;`">{{currentFiberOptic?currentFiberOptic.color:''}}
                      </div>
                      <i
                      v-if="currentFiberOptic" class="el-icon-caret-right table_caret" @click="caretOptic(1)"></i>
                      v-show="currentFiberOptic" class="el-icon-caret-right table_caret" @click="caretOptic(1)"></i>
                    </div>
                  </template>
                  <span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)" ></span>
                  <span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)" v-once></span>
                </div>
              </td>
            </tr>
@@ -563,7 +563,7 @@
              prop="resValue"
              label="衰减差"
              align="center"
              v-if="wareForm.inspectionItemSubclass!='20(常温)'"
              v-show="wareForm.inspectionItemSubclass!='20(常温)'"
              min-width="90" :key="(new Date())+'4'">
              <template slot="header">
                {{ '衰减差'+(index+1) }}
@@ -576,7 +576,7 @@
              prop="insResult"
              label="结论"
              align="center"
              min-width="70" v-if="wareForm.inspectionItemSubclass!='20(常温)'" :key="(new Date())+'5'">
              min-width="70" v-show="wareForm.inspectionItemSubclass!='20(常温)'" :key="(new Date())+'5'">
              <template slot="header">
                {{ '结论'+(index+1) }}
              </template>
@@ -628,11 +628,11 @@
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="循环次数:" v-if="thermalCyclingInfo.inspectionItemClass=='直流电阻'">
          <el-form-item label="循环次数:" v-show="thermalCyclingInfo.inspectionItemClass=='直流电阻'">
            <el-input-number v-model="thermalCyclingInfo.inspectionItem" :min="1" :max="thermalCyclingInfo.max" label="" style="margin-top:4px;width: 190px;" size="small" @change="thermalCyclingChange"></el-input-number>
          </el-form-item>
          <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 30px;" @click="handleAddThermal" v-if="state==1">新增</el-button>
          <el-button size="small" style="margin-bottom: 22px;" @click="handleDeleteThermal" v-if="state==1">删除</el-button>
          <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 30px;" @click="handleAddThermal" v-show="state==1">新增</el-button>
          <el-button size="small" style="margin-bottom: 22px;" @click="handleDeleteThermal" v-show="state==1">删除</el-button>
        </el-form>
        <div class="table-container" v-loading="thermalCyclingLoading">
          <table border="1" cellpadding="10" class="thermal-table">
@@ -649,7 +649,7 @@
                  <el-input clearable size="small" placeholder="" v-model="item.arr[i].value0" :disabled="state>1" @change="m=>saveThermalCycling(m,item,'value0')"></el-input>
                  <span style="font-size: 12px;margin-left: 13px;margin-right: 13px;"> â„ƒ</span>
                </div>
                <div style="display: flex;align-items: center;" v-if="item.name!='环境温度'&&thermalCyclingInfo.inspectionItemClass=='直流电阻'">
                <div style="display: flex;align-items: center;" v-show="item.name!='环境温度'&&thermalCyclingInfo.inspectionItemClass=='直流电阻'">
                  <label style="width: 100px;white-space: nowrap;font-size: 12px;">直流电阻:</label>
                  <el-input clearable size="small" :disabled="state>1" placeholder="" v-model="item.arr[i].value1" @change="saveThermalCycling"></el-input>
                  <span style="margin-left: 5px;font-size: 12px;"> Î©/km</span>
@@ -678,7 +678,7 @@
        accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' :headers="headers" :on-change="beforeUpload"
        style="width: 80px !important;"
        :on-error="onError" ref='upload'>
        <el-button size="small" type="primary" v-if="state==1">附件上传</el-button></el-upload>
        <el-button size="small" type="primary" v-show="state==1">附件上传</el-button></el-upload>
      <ValueTable class="value-table" ref="fileList" :url="$api.insOrderPlan.getFileList"
        :componentData="componentData0"
        :delUrl="$api.insOrderPlan.delfile"
@@ -687,7 +687,7 @@
    <el-drawer title="光纤切换" :visible.sync="fiberOpticVisible" :size="500">
      <el-table class="el-table" ref="fiberOpticTable" :data="fiberOptic" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeOptic" :row-class-name="tableRowClassName"
        :current-row-key="currentKey2" :row-key="record=>record.index" v-if="fiberOpticVisible">
        :current-row-key="currentKey2" :row-key="record=>record.index" v-show="fiberOpticVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="bushColor" label="管套色标" min-width="100px" show-overflow-tooltip></el-table-column>
@@ -700,7 +700,7 @@
    <el-drawer title="光纤带切换" :visible.sync="fiberOpticTapeVisible" :size="500">
      <el-table class="el-table" ref="fiberOpticTapeTable" :data="fiberOpticTape" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeTape" :row-class-name="tableRowClassName"
        :current-row-key="currentKey1" :row-key="record=>record.index" v-if="fiberOpticTapeVisible">
        :current-row-key="currentKey1" :row-key="record=>record.index" v-show="fiberOpticTapeVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="code" label="光纤带编号" min-width="110px" show-overflow-tooltip></el-table-column>
@@ -713,7 +713,7 @@
    <el-drawer title="套管切换" :visible.sync="bushingVisible" :size="500">
      <el-table class="el-table" ref="bushingTable" :data="bushing" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeBushing" :row-class-name="tableRowClassName"
        :current-row-key="currentKey0" :row-key="record=>record.index" v-if="bushingVisible">
        :current-row-key="currentKey0" :row-key="record=>record.index" v-show="bushingVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="color" label="管色标" min-width="100px" show-overflow-tooltip></el-table-column>
@@ -724,14 +724,14 @@
    <el-drawer title="样品切换" :visible.sync="sampleVisible" :size="500">
      <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
        :current-row-key="currentKey" :row-key="record=>record.index" v-if="sampleVisible">
        :current-row-key="currentKey" :row-key="record=>record.index" v-show="sampleVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="sampleCode" label="样品编号" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="model" label="样品型号" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="insState" label="检测状态" width="100px" show-overflow-tooltip>
          <template slot-scope="scope">
            <el-tag v-for="(item, i) in typeList" :key="i" v-if="item.value == scope.row.insState" :type="item.type"
            <el-tag v-for="(item, i) in typeList" :key="i" v-show="item.value == scope.row.insState" :type="item.type"
              size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
          </template>
        </el-table-column>
@@ -742,11 +742,11 @@
        </el-table-column>
        <!-- æ£€éªŒå•会有一个是否有配套样品字段控制显示 -->
        <el-table-column prop="joinModel" label="配套样品型号" min-width="130px" show-overflow-tooltip
          v-if="insOrder.mating>0"></el-table-column>
        v-show="insOrder.mating>0"></el-table-column>
        <el-table-column prop="joinName" label="配套样品名称" min-width="130px" show-overflow-tooltip
          v-if="insOrder.mating>0"></el-table-column>
        v-show="insOrder.mating>0"></el-table-column>
        <el-table-column prop="joinNum" label="配套样品数量" min-width="130px" show-overflow-tooltip
          v-if="insOrder.mating>0"></el-table-column>
        v-show="insOrder.mating>0"></el-table-column>
      </el-table>
    </el-drawer>
    <el-drawer title="任务切换" :visible.sync="taskVisible" :size="500">
@@ -754,7 +754,7 @@
        :componentData="componentData" :key="upIndex" style="height: 100%;"/>
    </el-drawer>
    <el-dialog title="检验复核" :visible.sync="reviewDia" width="500px">
      <div class="body" style="display: flex;padding: 10px;" v-if="reviewDia">
      <div class="body" style="display: flex;padding: 10px;" v-show="reviewDia">
        <div class="search_label" style="width: 150px;"><span class="required-span">* </span>不通过的理由:</div>
        <div class="search_input" style="width: 100%;">
          <el-input size="small" clearable v-model="noReason" type="textarea" :autosize="{ minRows: 4}"></el-input>
@@ -1125,11 +1125,15 @@
            return
          }
          this.dataAcquisitionInfo = res.data
          // å‘ Worker å‘送消息,开始处理逻辑
          this.worker0.postMessage(JSON.stringify({
            dataAcquisitionInfo: this.dataAcquisitionInfo,
            list:this.tableList[0].arr
          }));
          try {
            // å‘ Worker å‘送消息,开始处理逻辑
            this.worker0.postMessage(JSON.stringify({
              dataAcquisitionInfo: this.dataAcquisitionInfo,
              list:this.tableList[0].arr
            }));
          } catch (error) {
            console.log(1111,error);
          }
          // ç›‘听 Worker è¿”回的结果
          this.worker0.onmessage = (event) => {
            let result = JSON.parse(event.data);
@@ -1912,10 +1916,14 @@
        this.tableLists = this.currentSample.insProduct.filter(m => {
          let num0 = mySet1.size;
          if (m.templateId != null&&m.template != null) {
            mySet1.add(JSON.stringify({
              template: m.template,
              templateId: m.templateId
            }))
            try {
              mySet1.add(JSON.stringify({
                template: m.template,
                templateId: m.templateId
              }))
            } catch (error) {
              console.log(222,error);
            }
          }
          let num1 = mySet1.size;
          if (num1 > num0) {
@@ -1935,10 +1943,14 @@
        this.tableLists = list.filter(m => {
          let num0 = mySet1.size;
          if (m.templateId != null&&m.template != null) {
            mySet1.add(JSON.stringify({
              template: m.template,
              templateId: m.templateId
            }))
            try {
              mySet1.add(JSON.stringify({
                template: m.template,
                templateId: m.templateId
              }))
            } catch (error) {
              console.log(333,error);
            }
          }
          let num1 = mySet1.size;
          if (num1 > num0) {
@@ -2343,16 +2355,20 @@
            n.v.v = n.v.v.replace('/', '')
          }
        }
        // å‘ Worker å‘送消息,开始处理逻辑
        this.worker.postMessage(JSON.stringify({
          code: code,
          tableList:this.tableList,
          excelMethodList:this.excelMethodList,
          comparisonList:this.comparisonList,
          currentSample:this.currentSample,
          PROJECT:this.PROJECT,
          param:this.param
        }));
        try {
          // å‘ Worker å‘送消息,开始处理逻辑
          this.worker.postMessage(JSON.stringify({
            code: code,
            tableList:this.tableList,
            excelMethodList:this.excelMethodList,
            comparisonList:this.comparisonList,
            currentSample:this.currentSample,
            PROJECT:this.PROJECT,
            param:this.param
          }));
        } catch (error) {
          console.log(444,error);
        }
        // ç›‘听 Worker è¿”回的结果
        this.worker.onmessage = (event) => {
@@ -2433,8 +2449,12 @@
                  }
                  this.tableList[0].insProductResult[m].push(obj);
                })
                try {
                  this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
                } catch (error) {
                  console.log(555,error);
                }
              }
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'insValue':
              if (value && value.length > 0) {
@@ -2446,8 +2466,12 @@
                  }
                  this.tableList[0].insProductResult[m].push(obj);
                })
                try {
                  this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
                } catch (error) {
                  console.log(666,error);
                }
              }
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'equipValue':
              if (value && value.length > 0) {
@@ -2458,8 +2482,12 @@
                  }
                  this.tableList[0].insProductResult[m].push(obj);
                })
                try {
                  this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
                } catch (error) {
                  console.log(777,error);
                }
              }
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'equipName':
              if (value && value.length > 0) {
@@ -2470,8 +2498,12 @@
                  }
                  this.tableList[0].insProductResult[m].push(obj);
                })
                try {
                  this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
                } catch (error) {
                  console.log(888,error);
                }
              }
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'resValue':
              this.tableList[0].lastValue = value?value.v.v:''
@@ -2739,17 +2771,22 @@
        return
      },
      saveInsContext() {
        // console.profile()
        // console.log(1111,this.param)
        if(this.param){
          this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
            param: JSON.stringify(this.param)
          }).then(res => {
            if (res.code == 201) {
              this.$message.error('保存失败')
              return
            }
            this.$message.success('已保存')
          })
        try {
          if(this.param){
            this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
              param: JSON.stringify(this.param)
            }).then(res => {
              if (res.code == 201) {
                this.$message.error('保存失败')
                return
              }
              this.$message.success('已保存')
            })
          }
        }catch (error) {
          console.log(999,error);
        }
      },
      changeEquip(val, n) {
src/components/view/a6-standard-material-requisition.vue
@@ -82,15 +82,12 @@
<script>
  import ValueTable from '../tool/value-table.vue'
  import Word from '../tool/word.vue'
  import file from '../../util/file';
  import {
    convertToHtml
  } from 'mammoth';
export default {
  components: {
    ValueTable,
    Word,
  },
  data() {
    return {
src/components/view/b1-expenses.vue
@@ -104,11 +104,9 @@
<script>
  import ValueTable from '../tool/value-table.vue'
  import Word from '../tool/word.vue'
  export default {
    components: {
      ValueTable,
      Word,
    },
    data() {
      return {
src/components/view/b1-report-preparation.vue
@@ -153,12 +153,10 @@
<script>
  import ValueTable from '../tool/value-table.vue'
  import Word from '../tool/word.vue'
  import onlyoffice from '../tool/onlyoffice.vue'
  export default {
    components: {
      ValueTable,
      Word,
      onlyoffice
    },
    data() {
src/components/view/b1-unpass.vue
@@ -70,15 +70,12 @@
<script>
  import ValueTable from '../tool/value-table.vue'
  import Word from '../tool/word.vue'
  import file from '../../util/file';
  import {
    convertToHtml
  } from 'mammoth';
export default {
  components: {
    ValueTable,
    Word,
  },
  data() {
    return {
src/components/view/b3-classes.vue
@@ -44,7 +44,7 @@
      <el-button size="small" type="primary" @click="refreshTable()">查 è¯¢</el-button>
    </div>
    <div class="search_thing btns" style="padding-left: 30px;">
      <el-button size="small" type="primary" v-if="downPower" @click="configTime" :loading="downLoading">时间配置</el-button>
      <el-button size="small" type="primary" v-if="listPower" @click="configTime" :loading="downLoading">时间配置</el-button>
      <el-button size="small" type="primary" v-if="downPower" @click="handleDown" :loading="downLoading">导 å‡º</el-button>
      <el-button size="small" type="primary" @click="schedulingVisible = true" v-if="addPower">排 ç­</el-button>
    </div>
@@ -337,6 +337,7 @@
      configTimeVisibleLoading: false, // æ—¶é—´é…ç½®å¼¹æ¡†loading
      timeTypeList: [],
      timeQuery: [],
      listPower:false
    }
  },
  watch: {
@@ -375,7 +376,7 @@
      this.monthList.push(i)
    }
    this.monthList.reverse()
    // this.getPower()
    this.getPower()
  },
  methods: {
    refresh(){
@@ -547,6 +548,7 @@
      let add = false
      let up = false
      let down = false
      let listPower = false
      for (var i = 0; i < power.length; i++) {
        if (power[i].menuMethod == 'update') {
          up = true
@@ -557,10 +559,17 @@
        if (power[i].menuMethod == 'add') {
          add = true
        }
        if (power[i].menuMethod == 'add') {
          add = true
        }
        if (power[i].menuMethod == 'list') {
          listPower = true
        }
      }
      this.addPower = add
      this.upPower = up
      this.downPower = down
      this.listPower = listPower
    },
    onMouseEnter(index){
      this.currentUserIndex = index
src/main.js
@@ -43,6 +43,7 @@
Vue.use(VueAxios, axios)
Vue.config.productionTip = false
Vue.config.performance = true;
Vue.use(VueRouter);
Vue.use(ElementUI);
Vue.use(qs);
@@ -151,3 +152,4 @@
    Vue.prototype.$bus = this
  }
});
static/js/worker0.js
@@ -41,17 +41,7 @@
            if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('检验值')){
              let arr = n.v.ps.value.split('值')
              if(arr[1] ==dataAcquisitionInfo.frequency){
                n.v.v = dataAcquisitionInfo[str]
                result = {
                  method:'changeInput',
                  value:{
                    list:list,
                    n:n
                  }
                }
                self.postMessage(JSON.stringify(result))
              }else if(Number(dataAcquisitionInfo.frequency)>num){
                if(n.v.ps.value.includes(num)){
                setTimeout(()=>{
                  n.v.v = dataAcquisitionInfo[str]
                  result = {
                    method:'changeInput',
@@ -61,6 +51,29 @@
                    }
                  }
                  self.postMessage(JSON.stringify(result))
                },2000)
              }else if(Number(dataAcquisitionInfo.frequency)>num){
                if(n.v.ps.value.includes(num)){
                  setTimeout(()=>{
                    n.v.v = dataAcquisitionInfo[str]
                    result = {
                      method:'changeInput',
                      value:{
                        list:list,
                        n:n
                      }
                    }
                    self.postMessage(JSON.stringify(result))
                  },2000)
                  // n.v.v = dataAcquisitionInfo[str]
                  // result = {
                  //   method:'changeInput',
                  //   value:{
                  //     list:list,
                  //     n:n
                  //   }
                  // }
                  // self.postMessage(JSON.stringify(result))
                  // setTimeout(()=>{
                  //   this.$delete(n.v,'v')
                  //   this.$set(n.v,'v',this.dataAcquisitionInfo[str])
static/tinymce/langs/zh_CN.js
ÎļþÒÑɾ³ý
static/tinymce/skins/content/dark/content.css
ÎļþÒÑɾ³ý
static/tinymce/skins/content/dark/content.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/content/default/content.css
ÎļþÒÑɾ³ý
static/tinymce/skins/content/default/content.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/content/document/content.css
ÎļþÒÑɾ³ý
static/tinymce/skins/content/document/content.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/content/writer/content.css
ÎļþÒÑɾ³ý
static/tinymce/skins/content/writer/content.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/content.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/content.inline.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/content.inline.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/content.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/content.mobile.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/content.mobile.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff
Binary files differ
static/tinymce/skins/ui/oxide-dark/skin.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/skin.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/skin.mobile.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/skin.mobile.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/skin.shadowdom.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/content.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/content.inline.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/content.inline.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/content.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/content.mobile.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/content.mobile.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff
Binary files differ
static/tinymce/skins/ui/oxide/skin.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/skin.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/skin.mobile.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/skin.mobile.min.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/skin.shadowdom.css
ÎļþÒÑɾ³ý
static/tinymce/skins/ui/oxide/skin.shadowdom.min.css
ÎļþÒÑɾ³ý