Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-07-03 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c

 src/components/view/b2-standard.vue

@@ -85,7 +85,6 @@
  }

  .search {
    height: 20%;
    border-bottom: 1px solid #ebeef5;
    margin-bottom: 16px;
    display: flex;
@@ -147,9 +146,28 @@
    color: #bababa;
  }

  .el-table-filter__list{
  .standard .el-table-filter__list {
    max-height: 400px;
    overflow-y: auto;
  }

  .standard .el-upload {
    width: 100%;
  }

  .standard .el-upload-dragger {
    width: 100%;
  }

  .standard .handleBtn.is-disabled .el-upload:focus {
    color: #C0C4CC !important;
  }

  .standard .avatar-uploader .el-upload {
    height: 80px;
    display: flex;
    align-items: center;
    justify-content: center;
  }
</style>

@@ -173,11 +191,12 @@
        <div class="custom-tree-node" slot-scope="{ node, data }">
          <el-row style="width: 100%;">
            <el-col :span="21" :class="{sort:node.level>3}" :title="data.label">
              <span><i
                  :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
                {{ data.code }} {{ data.label }}</span>
              <span>
                <i :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
                {{ data.label }}
              </span>
            </el-col>
            <el-col :span="2" style="text-align: right;" v-if="delStandardTree&&node.level==5">
            <el-col :span="2" style="text-align: right;" v-if="delStandardTree&&(node.data.children===null||node.data.children===undefined)">
              <el-button type="text" size="mini" @click.stop="remove(node, data)">
                <i class="el-icon-delete"></i>
              </el-button>
@@ -189,7 +208,8 @@
    <div class="right">
      <el-row class="title" style="width: 100%;">
        <el-col :span="20" style="font-size: 14px;color: #999;">{{selectTree}}</el-col>
        <el-button size="small" type="primary" @click="handleMore" style="position: absolute;right: 0px;top: 1px;"
        <el-button size="small" type="primary" style="position: absolute;right: 100px;top: 1px;" @click="uploadDia = true" v-if="inExcelOfTreePower">导入</el-button>
        <el-button size="small" type="primary" @click="handleMore" style="position: absolute;right: 5px;top: 1px;"
          v-if="upStandardProduct">批量编辑</el-button>
      </el-row>
      <el-row class="standard_table" v-loading="tableLoad">
@@ -203,13 +223,6 @@
          </el-table-column>
          <el-table-column prop="name" label="标准名称" show-overflow-tooltip></el-table-column>
          <el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
          <!-- <el-table-column prop="createUserName" label="创建人"></el-table-column>
          <el-table-column prop="createTime" label="创建时间" width="250px"></el-table-column> -->
          <!-- <el-table-column label="操作" width="100" align="center" v-if="delStandardMethod">
                  <template slot-scope="scope">
                     <el-button type="text" size="small" @click="delStandardMethodByFLSSM(scope.row.id)">删除</el-button>
                  </template>
               </el-table-column> -->
        </el-table>
      </el-row>
      <el-row class="product_table" v-loading="tableLoad2">
@@ -218,6 +231,7 @@
          @select="upProductSelect" @select-all="handleAll" class="productTable" header-row-class-name="header-class">
          <el-table-column type="selection" width="50">
          </el-table-column>
          <el-table-column prop="sample" label="产品" min-width="100" show-overflow-tooltip></el-table-column>
          <el-table-column prop="model" label="型号" min-width="100" show-overflow-tooltip></el-table-column>
          <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip></el-table-column>
          <!-- <el-table-column prop="inspectionItemClassify" label="检验项类型" width="120" show-overflow-tooltip></el-table-column> -->
@@ -289,7 +303,7 @@
    </div>
    <el-dialog title="分类添加" :visible.sync="addDia" width="400px">
      <div class="body">
        <el-row style="line-height: 50px;">
        <!-- <el-row style="line-height: 50px;">
          <el-col :span="6" style="text-align: right;">工厂：</el-col>
          <el-col :span="16" :offset="1">
            <el-input size="small" readonly v-model="addOb.factory"></el-input>
@@ -312,13 +326,13 @@
          <el-col :span="16" :offset="1">
            <el-input v-model="addOb.sample" readonly size="small"></el-input>
          </el-col>
        </el-row>
        </el-row> -->
        <el-row style="line-height: 50px;">
          <el-col :span="6" style="text-align: right;">
            <span class="required-span">* </span>型号：
          </el-col>
          <el-col :span="16" :offset="1">
            <el-input v-model="addOb.model" placeholder="请输入型号" clearable size="small"></el-input>
            <el-input v-model="addOb.model" placeholder="请输入型号" clearable size="small" @keyup.enter.native="addStandardTree"></el-input>
          </el-col>
        </el-row>
      </div>
@@ -328,7 +342,7 @@
      </span>
    </el-dialog>
    <el-dialog title="批量编辑" :visible.sync="moreEdit" width="90%" class="more-edit">
      <div class="body" style="display: flex;flex-direction: column;height: 80vh;">
      <div class="body" style="display: flex;flex-direction: column;height: 85vh;">
        <div class="search">
          <div class="search-item">
            <el-row style="width: 25%;margin-bottom: 16px;">
@@ -354,7 +368,7 @@
                试验方法：</el-col>
              <el-col :span="16">
                <el-select v-model="moreInfo.methodS" size="small" filterable style="width: 100%;"
                  :disabled="moreSelects.length==0">
                  :disabled="moreSelects.length==0" clearable>
                  <el-option v-for="(a, ai) in methodList" :key="ai" :label="a.label" :value="a.value"></el-option>
                </el-select>
              </el-col>
@@ -387,8 +401,21 @@
                </el-select>
              </el-col>
            </el-row>
            <el-row style="width: 50%;">
              <el-col :span="23" style="display: flex;align-items: center;justify-content: end;">
            <el-row style="width: 25%;">
              <el-col :span="6" style="text-align: right;">
                是否启用：</el-col>
              <el-col :span="16">
                <el-select v-model="moreInfo.state" size="small" filterable placeholder="模板" style="width: 100%;"
                  :disabled="moreSelects.length==0" clearable>
                  <el-option label="启用" :value="1"></el-option>
                  <el-option label="不启用" :value="0"></el-option>
                </el-select>
              </el-col>
            </el-row>
            <el-row style="width: 100%;margin-top: 8px;">
              <el-col :span="24" style="display: flex;align-items: center;justify-content: end;">
                <el-button @click="clearProduct(1)" size="small" type="danger">重置单价</el-button>
                <el-button @click="clearProduct(2)" size="small" type="danger">重置工时系数</el-button>
                <el-button type="primary" size="small" @click="sectionUp(moreSelects)">设置区间</el-button>
                <el-button @click="moreEdit = false" size="small">取 消</el-button>
                <el-button type="primary" @click="subMoreEdit" :loading="moreEditLoad" size="small">保 存</el-button>
@@ -397,16 +424,18 @@
          </div>
        </div>
        <div style="flex: 1;overflow-y: auto;" v-loading="productTableLoading0">
          <el-table :data="productList0" ref="productTable0" style="width: 100%;" height="94%" tooltip-effect="dark"
          <el-table :data="productList0" ref="productTable0" style="width: 100%;" height="96%" tooltip-effect="dark"
            stripe :fit="true" border @select-all="handleSelectAll0" @select="handleSelectionChange0"
            header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler">
            header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler" highlight-current-row>
            <el-table-column type="selection" width="50">
            </el-table-column>
            <el-table-column prop="sample" label="产品" min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column prop="model" label="型号" min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip :filters="filters0"
              :filter-multiple="false" column-key="inspectionItem" filter-placement="bottom-start"></el-table-column>
            <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140" show-overflow-tooltip
              :filters="filters1" :filter-multiple="false" column-key="inspectionItemSubclass" filter-placement="bottom-start"></el-table-column>
              :filters="filters1" :filter-multiple="false" column-key="inspectionItemSubclass"
              filter-placement="bottom-start"></el-table-column>
            <el-table-column prop="sonLaboratory" label="子实验室" width="130" show-overflow-tooltip :filters="filters"
              :filter-multiple="false" column-key="sonLaboratory" filter-placement="bottom-start"></el-table-column>
            <el-table-column prop="ask" label="要求值" min-width="200px"></el-table-column>
@@ -429,7 +458,7 @@
        </div>
      </div>
    </el-dialog>
    <el-dialog title="区间设置" :visible.sync="sectionUpDia" width="70%">
    <el-dialog title="区间设置" :visible.sync="sectionUpDia" width="70%" :close-on-click-modal="false">
      <div class="body" style="padding: 5px 0;">
        <el-table :data="sectionList" border style="width: 100%" height="350px">
          <el-table-column type="index" label="序号" width="70" align="center">
@@ -471,7 +500,21 @@
      <span slot="footer" class="dialog-footer">
        <el-button @click="sectionUpDia = false">取 消</el-button>
        <el-button type="primary" @click="sectionLoadAdd" :loading="sectionLoad">保 存</el-button>
        <el-button type="primary" @click="sectionList.push({thing: ''})" icon="el-icon-plus"></el-button>
        <el-button type="primary" @click="sectionList.push({thing: '',price: sectionRow.price,manHour: sectionRow.manHour})" icon="el-icon-plus"></el-button>
      </span>
    </el-dialog>
    <el-dialog title="数据导入" :visible.sync="uploadDia" width="500px">
      <div style="margin: 0 auto;">
        <el-upload ref="upload" drag :action="javaApi + $api.standardTree.inExcelOfTree" :headers="token" :file-list="fileList" name="file"
          :auto-upload="false" accept=".xlsx" :limit="1" :on-change="beforeUpload" :on-success="onSuccess"
          :on-error="onError">
          <i class="el-icon-upload"></i>
          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
        </el-upload>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="uploadDia = false">取 消</el-button>
        <el-button type="primary" @click="submitUpload()" :loading="uploading">上 传</el-button>
      </span>
    </el-dialog>
  </div>
@@ -573,7 +616,8 @@
          methodS: '',
          price: '',
          manHour: '',
          templateId: ''
          templateId: '',
          state: null
        },
        methodList: [],
        productTableLoading0: false,
@@ -582,7 +626,12 @@
        pages: 1,
        inspectionItem: null,
        inspectionItemSubclass: null,
        sonLaboratory: null
        sonLaboratory: null,
        uploadDia: false,
        token: null,
        fileList: [],
        inExcelOfTreePower: false,
        uploading: false,
      }
    },
    watch: {
@@ -619,6 +668,9 @@
      this.selectEnumByCategoryForSonLaboratory()
      this.getStandardTemplate()
      this.selectStandardMethods()
      this.token = {
        'token': sessionStorage.getItem('token')
      }
    },
    methods: {
      filterNode(value, data) {
@@ -652,7 +704,11 @@
      },
      getNodeParent(val) {
        if (val.parent != null) {
          this.selectTree += ' - ' + val.label
          if(val.data.children === null){
            this.selectTree += ' - ' + val.label + ' - ' + 'null'
          }else{
            this.selectTree += ' - ' + val.label
          }
          this.getNodeParent(val.parent)
        }
      },
@@ -825,8 +881,8 @@
        })
      },
      addStandardTree() {
        if (this.addOb.sample == null || this.addOb.sample == '') {
          this.$message.error('产品不存在')
        if (this.addOb.sampleType == null || this.addOb.sampleType == '') {
          this.$message.error('对象不存在')
          return
        }
        if (this.addOb.model == null || this.addOb.model == '') {
@@ -884,6 +940,7 @@
        let delStandardProduct = false
        let addStandardProduct = false
        let delStandardTree = false
        let inExcelOfTreePower = false
        for (var i = 0; i < power.length; i++) {
          if (power[i].menuMethod == 'addStandardTree') {
            add = true
@@ -906,6 +963,9 @@
          if (power[i].menuMethod == 'delStandardTree') {
            delStandardTree = true
          }
          if (power[i].menuMethod == 'inExcelOfTree') {
            inExcelOfTreePower = true
          }
        }
        this.addPower = add
        this.addStandardMethod = addStandardMethod
@@ -914,15 +974,14 @@
        this.delStandardProduct = delStandardProduct
        this.addStandardProduct = addStandardProduct
        this.delStandardTree = delStandardTree
        this.inExcelOfTreePower = inExcelOfTreePower
      },
      upStandardProductList(value, index) {
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: index,
          ask: value
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
          str: JSON.stringify({
            id: index,
            ask: value
          })
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('未保存')
@@ -933,12 +992,10 @@
      },
      upStandardProductListOfTell(value, index) {
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: index,
          tell: value
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
          str: JSON.stringify({
            id: index,
            tell: value
          })
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('未保存')
@@ -949,12 +1006,10 @@
      },
      upStandardProductListOfMethodS(value, index) {
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: index,
          methodS: value
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
          str: JSON.stringify({
            id: index,
            methodS: value
          })
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('未保存')
@@ -965,12 +1020,10 @@
      },
      upStandardProductListOfPrice(value, index) {
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: index,
          price: value
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
          str: JSON.stringify({
            id: index,
            price: value
          })
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('未保存')
@@ -981,12 +1034,10 @@
      },
      upStandardProductListOfManHour(value, index) {
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: index,
          manHour: value
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
          str: JSON.stringify({
            id: index,
            manHour: value
          })
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('未保存')
@@ -997,12 +1048,10 @@
      },
      upStandardProductListOfTemplate(value, index) {
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: index,
          templateId: value
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
          str: JSON.stringify({
            id: index,
            templateId: value
          })
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('未保存')
@@ -1114,12 +1163,10 @@
      upProductSelect(selection, row) {
        row.state = (row.state == 1 ? 0 : 1)
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: row.id,
          state: row.state
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
          str: JSON.stringify({
            id: row.id,
            state: row.state
          })
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('未保存')
@@ -1130,20 +1177,20 @@
      },
      filterHandler(value) {
        for (let column in value) {
          if(value[column].length === 0){
            if(column==='inspectionItem'){
          if (value[column].length === 0) {
            if (column === 'inspectionItem') {
              this.inspectionItem = null
            }else if(column === 'inspectionItemSubclass'){
            } else if (column === 'inspectionItemSubclass') {
              this.inspectionItemSubclass = null
            }else if(column === 'sonLaboratory'){
            } else if (column === 'sonLaboratory') {
              this.sonLaboratory = null
            }
          }else{
            if(column==='inspectionItem'){
          } else {
            if (column === 'inspectionItem') {
              this.inspectionItem = value[column][0]
            }else if(column === 'inspectionItemSubclass'){
            } else if (column === 'inspectionItemSubclass') {
              this.inspectionItemSubclass = value[column][0]
            }else if(column === 'sonLaboratory'){
            } else if (column === 'sonLaboratory') {
              this.sonLaboratory = value[column][0]
            }
          }
@@ -1173,6 +1220,7 @@
          }
          this.sectionRow = {}
          this.sectionUpDia = true
          this.sectionList = []
        } else {
          // 值是一个对象
          this.sectionRow = row
@@ -1222,16 +1270,14 @@
        this.sectionLoad = true
        if (this.moreSelects.length === 0) {
          this.$axios.post(this.$api.standardTree.upStandardProductList, {
            id: this.sectionRow.id,
            section: this.sectionRow.section,
            ask: this.sectionRow.ask,
            tell: this.sectionRow.tell,
            price: this.sectionRow.price,
            manHour: this.sectionRow.manHour
          }, {
            headers: {
              'Content-Type': 'application/json'
            }
            str: JSON.stringify({
              id: this.sectionRow.id,
              section: this.sectionRow.section,
              ask: this.sectionRow.ask,
              tell: this.sectionRow.tell,
              price: this.sectionRow.price,
              manHour: this.sectionRow.manHour
            })
          }).then(res => {
            this.sectionLoad = false
            if (res.code == 201) {
@@ -1243,7 +1289,7 @@
          })
        } else {
          this.$axios.post(this.$api.standardTree.upStandardProducts, {
            ids: this.moreSelects.map(a => a.id),
            ids: JSON.stringify(this.moreSelects.map(a => a.id)),
            standardProductList: {
              section: this.sectionRow.section,
              ask: this.sectionRow.ask,
@@ -1317,8 +1363,8 @@
          return this.$message.error('请选择检验项')
        }
        this.moreEditLoad = true
        for(let a in this.moreInfo){
          if(this.moreInfo[a]==''){
        for (let a in this.moreInfo) {
          if (this.moreInfo[a] == '') {
            delete this.moreInfo[a]
          }
        }
@@ -1399,21 +1445,22 @@
        this.currentPage0 = e;
        this.getList()
      },
      getItemEnum(){
        this.$axios.post(this.$api.standardTree.selectStandardProductEnumByMethodId,{
      getItemEnum() {
        this.$axios.post(this.$api.standardTree.selectStandardProductEnumByMethodId, {
          id: this.standardId,
          tree: this.selectTree
        }).then(res=>{
          tree: this.selectTree,
          item:this.inspectionItem
        }).then(res => {
          this.filters0 = []
          this.filters1 = []
          res.data.item.forEach(a=>{
          res.data.item.forEach(a => {
            this.filters0.push({
              text: a.inspectionItem,
              value: a.inspectionItem
            })
          })
          res.data.items.forEach(a=>{
            if(a!=null){
          res.data.items.forEach(a => {
            if (a != null) {
              this.filters1.push({
                text: a.inspectionItemSubclass,
                value: a.inspectionItemSubclass
@@ -1421,6 +1468,78 @@
            }
          })
        })
      },
      beforeUpload(file, fileList) {
        if (file.raw.type != 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
          this.$message.error('上传文件格式不正确');
          this.$refs.upload.clearFiles()
          return false;
        }
      },
      submitUpload() {
        if (this.$refs.upload.uploadFiles.length == 0) {
          this.$message.error('未选择文件')
          return
        }
        this.uploading = true
        this.$refs.upload.submit();
      },
      onSuccess(response, file, fileList) {
        this.$refs.upload.clearFiles()
        this.uploadDia = false
        this.uploading = false
        if (response.code == 201) {
          this.$message.error(response.message)
          return
        }
        this.$message.success('上传成功')
        this.standardList = []
        this.productList = []
        this.selectStandardTreeList()
      },
      onError(err, file, fileList) {
        this.$message.error('上传失败')
        this.$refs.upload.clearFiles()
        this.uploading = false
      },
      clearProduct(type){
        this.$confirm('是否清空?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          if(type === 1){
            this.$axios.post(this.$api.standardTree.resetTreeOfPrice, {
              tree: this.selectTree,
              standardId: this.standardId
            }).then(res => {
              if (res.code == 201) {
                return
              }
              this.$message.success('已清空')
              this.currentPage0 = 1;
              this.getList()
              this.rowClick({
                id: this.standardId
              })
            })
          }else if(type === 2){
            this.$axios.post(this.$api.standardTree.resetTreeOfHour, {
              tree: this.selectTree,
              standardId: this.standardId
            }).then(res => {
              if (res.code == 201) {
                return
              }
              this.$message.success('已清空')
              this.currentPage0 = 1;
              this.getList()
              this.rowClick({
                id: this.standardId
              })
            })
          }
        }).catch(() => {})
      }
    }
  }