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

licp

2024-03-20 15fc2eb2a1e0a92efb877d96f7c72ba7fbed3ecd

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

 package-lock.json

@@ -177,6 +177,11 @@
        }
      }
    },
    "@tinymce/tinymce-vue": {
      "version": "3.2.8",
      "resolved": "https://registry.npmmirror.com/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz",
      "integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA=="
    },
    "@transloadit/prettier-bytes": {
      "version": "0.0.7",
      "resolved": "https://registry.npmjs.org/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz",
@@ -12039,6 +12044,11 @@
      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
      "integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="
    },
    "tinymce": {
      "version": "5.10.9",
      "resolved": "https://registry.npmmirror.com/tinymce/-/tinymce-5.10.9.tgz",
      "integrity": "sha512-5bkrors87X9LhYX2xq8GgPHrIgJYHl87YNs+kBcjQ5I3CiUgzo/vFcGvT3MZQ9QHsEeYMhYO6a5CLGGffR8hMg=="
    },
    "tmp": {
      "version": "0.2.3",
      "resolved": "https://registry.npmmirror.com/tmp/-/tmp-0.2.3.tgz",

 src/assets/api/controller.js

@@ -150,11 +150,15 @@
    addStandardProduct: "/standardTree/addStandardProduct", //新增标准树下的检验项目
    delStandardTree: "/standardTree/delStandardTree", //删除标准树的层级
    selectStandardProductList: "/standardTree/selectStandardProductList", //通过标准树查询对应的检验项目
    selectStandardProductListByMethodId: "/standardTree/selectStandardProductListByMethodId", //通过检验标准查询检验项目
}

const standardMethod = {
    selectStandardMethodList: "/standardMethod/selectStandardMethodList", //获取标准方法列表
    selectStandardMethods: "/standardMethod/selectStandardMethods", //获取标准方法枚举
    addStandardMethod: "/standardMethod/addStandardMethod", //添加标准方法
    upStandardMethod: "/standardMethod/upStandardMethod", //修改标准方法
    delStandardMethod: "/standardMethod/delStandardMethod", //删除标准方法
}

const StandardTemplate = {

 src/components/do/b1-ins-order/add.vue

@@ -3,6 +3,7 @@
        width: 100%;
        height: 100%;
        overflow-y: auto;
        overflow-x: hidden;
    }

    .ins_order_add::-webkit-scrollbar {
@@ -46,7 +47,6 @@
    align-items: center;
    justify-content: space-between;
  }

</style>
<style>
    .ins_order_add .el-input-group__append,
@@ -88,18 +88,21 @@
            <el-row class="title">
                <el-col :span="6" style="padding-left: 20px;">委托单信息</el-col>
                <el-col :span="18" style="text-align: right;">
                    <el-select v-model="template" size="medium" placeholder="下单模板" style="margin-right: 10px;" v-show="active==1" @change="selectInsOrderTemplateById">
                    <el-select v-model="template" size="medium" placeholder="下单模板" style="margin-right: 10px;" v-show="active==1"
                        @change="selectInsOrderTemplateById">
                        <el-option v-for="(a, ai) in templates" :key="ai" :value="a.id" :label="a.name">
              <span style="float: left">{{ a.name }}</span>
              <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px" @click.stop="handleDelete(a)"></i>
                            <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px"
                                @click.stop="handleDelete(a)"></i>
            </el-option>
                    </el-select>
                    <el-button size="medium" @click="templateDia=true" v-show="active==1">
                        <span style="color: #3A7BFA;">保存模板</span>
                    </el-button>
                    <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">提交</el-button>
          <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3">审核不通过</el-button>
          <el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad" v-show="active==3">审核通过</el-button>
                    <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3">不通过</el-button>
                    <el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad"
                        v-show="active==3">通过</el-button>
                    <el-button size="medium" @click="$parent.playOrder(0)">
                        <span style="color: #3A7BFA;">返回</span>
                    </el-button>
@@ -130,17 +133,46 @@
                    </div>
                </el-col>
                <el-col class="search_thing" :span="6">
                    <div class="search_label">需求时间：</div>
                    <div class="search_input">
                        <el-date-picker type="date" placeholder="选择日期" size="small" value-format="yyyy-MM-dd" style="width: 100%;"
                            v-model="addObj.appointed"></el-date-picker>
                    </div>
                </el-col>
                <el-col class="search_thing" :span="6">
                    <div class="search_label"><span class="required-span">* </span>紧急程度：</div>
                    <div class="search_input">
                        <el-select size="small" style="width: 100%;" clearable v-model="addObj.type">
                            <el-option v-for="(a, ai) in type" :key="ai" :value="a.value" :label="a.label"></el-option>
                        </el-select>
                    </div>
                </el-col>
                <el-col class="search_thing" :span="6">
                    <div class="search_label"><span class="required-span">* </span>样品名称：</div>
                    <div class="search_input">
                        <el-input readonly size="small" v-model="addObj.sample">
                            <template slot="append"><el-button slot="append" icon="el-icon-search"
                                    @click="selectStandardTree = true"></el-button></template>
                        </el-input>
                    </div>
                </el-col>
                <el-col class="search_thing" :span="6">
                    <div class="search_label"><span class="required-span">* </span>实验室：</div>
                    <div class="search_input">
                        <el-input size="small" clearable disabled v-model="addObj.laboratory"></el-input>
                    </div>
                </el-col>
                <el-col class="search_thing" :span="6">
                    <div class="search_label"><span class="required-span">* </span>样品类型：</div>
                    <div class="search_input">
                        <el-input size="small" clearable disabled v-model="addObj.sampleType"></el-input>
                    </div>
                </el-col>
                <el-col class="search_thing" :span="6">
                    <div class="search_label"><span class="required-span">* </span>样品数量：</div>
                    <div class="search_input">
                        <el-input-number size="small" v-model="addObj.sampleNum" :min="1" :max="100" :precision="0"
                            style="width: 65%;" @change="addStandardTree"></el-input-number>
                    </div>
                </el-col>
                <el-col class="search_thing" :span="6">
                    <div class="search_label">样品单位：</div>
                    <div class="search_input">
                        <el-select v-model="addObj.unit" clearable size="small" style="width: 100%;">
                            <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
                        </el-select>
                    </div>
                </el-col>
@@ -169,34 +201,63 @@
            </el-row>
        </div>
        <div>
            <div style="text-align: right;line-height: 45px;" v-if="active<2">
            <!-- <div style="text-align: right;line-height: 45px;" v-if="active<2">
                <el-button type="primary" size="small" @click="addSampleDia = true"  >添加样品</el-button>
                <el-button size="small" @click="delSample">
                    <span style="color: #3A7BFA;">删除样品</span>
                </el-button>
            </div>
            <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark" border
                @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
            </div> -->
            <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark"
                border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
                <el-table-column type="selection" width="60"></el-table-column>
                <el-table-column type="index" label="序号" width="65" align="center"></el-table-column>
                <el-table-column prop="sample" label="样品名称" align="center" show-overflow-tooltip
                    min-width="100"></el-table-column>
                <el-table-column prop="sampleCode" label="样品编号" width="140" align="center">
                <el-table-column prop="sample" label="样品名称" align="center" show-overflow-tooltip min-width="100">
                    <template slot-scope="scope">
                        <el-input size="small" v-model="scope.row.sampleCode" clearable></el-input>
                        <el-input size="small" v-model="scope.row.sample" clearable></el-input>
                    </template>
                </el-table-column>
                <el-table-column prop="factory" label="工厂" align="center" show-overflow-tooltip min-width="100">
                <el-table-column prop="sampleCode" label="样品编号" min-width="140" align="center">
                    <template slot-scope="scope">
                        <el-input size="small" v-model="scope.row.sampleCode" clearable placeholder="不填写则系统自动生成"></el-input>
                    </template>
                </el-table-column>
                <!-- <el-table-column prop="factory" label="工厂" align="center" show-overflow-tooltip min-width="100">
                </el-table-column>
                <el-table-column prop="laboratory" label="实验室" align="center" show-overflow-tooltip min-width="100">
                </el-table-column>
                <el-table-column prop="sampleType" label="样品类型" align="center" show-overflow-tooltip min-width="100">
                </el-table-column>
                </el-table-column> -->
                <el-table-column prop="model" label="样品型号" align="center" show-overflow-tooltip min-width="100">
                    <template slot-scope="scope">
                        <el-select v-model="scope.row.model" filterable allow-create default-first-option placeholder="样品型号"
                            size="small">
                            <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
                            </el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column prop="standardMethodListId" label="检验标准" align="center" show-overflow-tooltip min-width="100">
                    <template slot-scope="scope">
                        <el-select v-model="scope.row.method" :disabled="scope.row.model==null" filterable placeholder="检验标准" size="small"
                            :loading="methodLoad" @change="(value)=>methodChange(value, scope.row)" @focus="methodFocus">
                            <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
                            </el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column prop="unit" label="单位" align="center" show-overflow-tooltip min-width="100">
                    <template slot-scope="scope">
                        <el-select v-model="scope.row.unit" clearable size="small" style="width: 100%;">
                            <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column prop="isLeave" label="是否留样" align="center" show-overflow-tooltip min-width="100">
                    <template slot-scope="scope">
                        <span>{{scope.row.isLeave==1?'是':'否'}}</span>
                        <el-select v-model="scope.row.isLeave" size="small">
                            <el-option label="留样" :value="1"></el-option>
                            <el-option label="不留样" :value="0"></el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column prop="joinName" label="配套样品名称" width="140" align="center" v-if="addObj.mating==1">
@@ -217,22 +278,22 @@
                            :controls="false" style="width: 80%;"></el-input-number>
                    </template>
                </el-table-column>
                <el-table-column label="操作" width="65" align="center">
                <!-- <el-table-column label="操作" width="65" align="center">
                    <template slot-scope="scope">
                        {{scope.index}}
                        <el-button type="text" size="small" @click="delSampleAndProduct" :disabled="active!=1">删除</el-button>
                    </template>
                </el-table-column>
                </el-table-column> -->
            </el-table>
            <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
                @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
                :row-class-name="tableRowClassName">
                :row-class-name="tableRowClassName" v-loading="getProductLoad">
                <el-table-column type="selection" width="65"></el-table-column>
                <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip></el-table-column>
                <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140"
                    show-overflow-tooltip></el-table-column>
                <el-table-column prop="sonLaboratory" label="子实验室" width="130" show-overflow-tooltip></el-table-column>
                <el-table-column prop="method" label="检验标准" min-width="120" show-overflow-tooltip></el-table-column>
                <el-table-column prop="method" label="试验方法" min-width="120" show-overflow-tooltip></el-table-column>
                <el-table-column prop="unit" label="计量单位" width="100" show-overflow-tooltip></el-table-column>
                <el-table-column prop="price" label="单价" width="100" show-overflow-tooltip></el-table-column>
                <el-table-column prop="manDay" label="预计时间(天)" width="120" show-overflow-tooltip></el-table-column>
@@ -423,7 +484,15 @@
                    appointed: null,
                    remark: null,
                    otcCode: null,
                    mating: 0
                    mating: 0,
                    sample: null,
                    factory: null,
                    laboratory: null,
                    sampleType: null,
                    sampleNum: 1,
                    unit: null,
                    model: null,
                    method: null
                },
                sample: {
                    sampleCode: null,
@@ -434,6 +503,7 @@
                    model: null,
                    sampleNum: 1,
                    isLeave: 0,
                    unit: null
                },
                type: [],
                selectUserDia: false,
@@ -487,6 +557,16 @@
        },
        personList:[],
        upLoad:false,
                units: [],
                models: [],
                methods: [],
                methodLoad: false
            }
        },
        watch: {
            sampleList() {
                this.addObj.method = null
                this.productList = []
            }
        },
        mounted() {
@@ -495,6 +575,7 @@
            this.selectStandardTreeList()
      this.selectInsOrderTemplate()
      this.getAuthorizedPerson();
            this.selectEnumByCategoryForUnit()
      if(this.active==1){
        // ä¸‹å•æµç¨‹
      }else {
@@ -503,7 +584,9 @@
        this.$axios.post(this.$api.insOrder.getInsOrder, {
                    orderId: this.currentId
                }).then(res => {
          this.addObj = {...res.data.insOrder};
                    this.addObj = {
                        ...res.data.insOrder
                    };
          this.addObj.type = String(this.addObj.type)
          this.sampleList = this.HaveJson(res.data.sampleProduct);
          this.$nextTick(()=>{
@@ -653,6 +736,7 @@
            },
            handleNodeClick(val, node, el) { //树的值
                this.selectTree = ''
                this.models = val.children
                this.getNodeParent(node)
                this.selectTree = this.selectTree.replace(' - ', '')
                let data = this.selectTree.split(' - ')
@@ -688,12 +772,54 @@
                    this.$message.error('未选择样品')
                    return
                }
                this.sample.factory = trees[0]
                this.sample.laboratory = trees[1]
                this.sample.sampleType = trees[2]
                this.sample.sample = trees[3]
                this.sample.model = trees[4]
                this.addObj.factory = trees[0]
                this.addObj.laboratory = trees[1]
                this.addObj.sampleType = trees[2]
                this.addObj.sample = trees[3]
                this.addObj.model = (trees[4] == undefined ? null : trees[4])
                this.selectStandardTree = false
                this.sampleList = []
                for (var i = 0; i < this.addObj.sampleNum; i++) {
                    this.sample.joinName = null
                    this.sample.joinModel = null
                    this.sample.joinNum = 1
                    this.sample.sample = this.addObj.sample
                    this.sample.model = this.addObj.model
                    this.sample.unit = this.addObj.unit
                    this.sample.standardMethodListId = null
                    this.sample.insProduct = []
                    this.sample.id = this.count
                    this.sampleList.push(this.HaveJson(this.sample))
                    this.count++
                }
                this.$refs.sampleTable.doLayout()
                this.selectsStandardMethodByFLSSM()
            },
            selectsStandardMethodByFLSSM() {
                this.methodLoad = true
                this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
                    tree: this.selectTree
                }).then(res => {
                    this.methodLoad = false
                    this.methods = res.data.standardMethodList
                })
            },
            addStandardTree() {
                if (this.selectTree == null) return
                this.sampleList = []
                for (var i = 0; i < this.addObj.sampleNum; i++) {
                    this.sample.joinName = null
                    this.sample.joinModel = null
                    this.sample.joinNum = 1
                    this.sample.sample = this.addObj.sample
                    this.sample.model = this.addObj.model
                    this.sample.unit = this.addObj.unit
                    this.sample.standardMethodListId = null
                    this.sample.insProduct = []
                    this.sample.id = this.count
                    this.sampleList.push(this.HaveJson(this.sample))
                    this.count++
                }
            },
            selectSample(val) {
                this.sampleIds = []
@@ -710,8 +836,8 @@
                    this.$message.error('请输入样品型号')
                    return
                }
                this.getProductLoad = true
                this.$axios.post(this.$api.standardTree.selectStandardProductList, {
                // this.getProductLoad = true
                /* this.$axios.post(this.$api.standardTree.selectStandardProductList, {
                    factory: this.sample.factory,
                    laboratory: this.sample.laboratory,
                    sampleType: this.sample.sampleType,
@@ -747,7 +873,7 @@
                        sampleNum: 1,
                        isLeave: 0,
                    }
                })
                }) */
            },
            delSample() {
                this.sampleIds.forEach(a => {
@@ -773,7 +899,7 @@
                    this.productList.forEach(a => {
                        if (a.state == 1) this.toggleSelection(a)
                    })
                }, 300)
                }, 200)
            },
            toggleSelection(row) {
                this.$refs.productTable.toggleRowSelection(row, true);
@@ -822,7 +948,10 @@
          this.templateLoading = true;
          this.$axios.post(this.$api.insOrder.addInsOrderTemplate,{
            name:this.templateName,
            thing:JSON.stringify({addObj:this.addObj,sampleList:this.sampleList})
                        thing: JSON.stringify({
                            addObj: this.addObj,
                            sampleList: this.sampleList
                        })
          },{
                    headers: {
                        'Content-Type': 'application/json'
@@ -851,6 +980,43 @@
      delSampleAndProduct(){
        this.sampleList.splice(scope.$index, 1)
        this.productList = []
            },
            selectEnumByCategoryForUnit() {
                this.$axios.post(this.$api.enums.selectEnumByCategory, {
                    category: "单位"
                }).then(res => {
                    this.units = res.data
                })
            },
            methodChange(val) {
                this.$refs.sampleTable.doLayout()
                this.getProductLoad = true
                this.$axios.post(this.$api.standardTree.selectStandardProductList, {
                    model: this.addObj.model,
                    standardMethodListId: val
                }, {
                    headers: {
                        'Content-Type': 'application/json'
                    }
                }).then(res => {
                    res.data.forEach(a => {
                        a.state = 1
                    })
                    this.sampleIds.forEach(a => {
                        for (var b in this.sampleList) {
                            if (this.sampleList[b].id == a) {
                                this.sampleList[b].standardMethodListId = val
                                this.sampleList[b].insProduct = this.HaveJson(res.data)
                            }
                        }
                    })
                    this.getProductLoad = false
                    this.productList = []
                    this.$refs.sampleTable.setCurrentRow()
                })
            },
            methodFocus(){
                this.selectsStandardMethodByFLSSM()
      }
        }
    }

 src/components/tool/value-table.vue

@@ -40,22 +40,28 @@
    border-top: 2px solid #ffcd29;
    border-bottom: 2px solid #ffcd29;
  }

  .value-table .highlight-warning-row-border td:first-child{
    border-left: 2px solid #ffcd29;
  }

  .value-table .highlight-warning-row-border td:last-child{
    border-right: 2px solid #ffcd29;
  }

  .value-table .highlight-danger-row-border td{
    border-top: 2px solid red;
    border-bottom: 2px solid red;
  }

  .value-table .highlight-danger-row-border td:first-child{
    border-left: 2px solid red;
  }

  .value-table .highlight-danger-row-border td:last-child{
    border-right: 2px solid red;
  }

    .value-table .el-upload {
        width: 100%;
    }
@@ -76,20 +82,28 @@
                </el-table-column>
                <el-table-column type="index" align="center" label="序号" width="70" v-if="data.isIndex" :key="Math.random()">
                </el-table-column>
                <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" v-for="(a, ai) in tableHead" :key="ai"
         show-overflow-tooltip min-width="160">
                <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'"
                    v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="160">
                    <template slot-scope="scope">
                        <div v-if="showType(a.label, data.tagField) != null">
                            <template v-if="typeof(scope.row[a.label]) == 'object'">
                                <template v-for="(param, i) in scope.row[a.label]">
                                    <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == param"
                                        :type="b.type" size="medium" style="margin-right: 5px;">{{b.label}}</el-tag>
                                </template>
                            </template>
                            <template v-else>
                            <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == scope.row[a.label]"
                                :type="b.type" size="medium">{{b.label}}</el-tag>
                            </template>
                        </div>
            <!-- å¯æ“ä½œè¡Œè¿›è¡Œç‚¹å‡»äº‹ä»¶ -->
            <span v-else-if="data.linkEvent&&showLink(a.label, data.linkEvent)" style="color:#409EFF;cursor: pointer;" @click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
                        <span v-else-if="data.linkEvent&&showLink(a.label, data.linkEvent)" style="color:#409EFF;cursor: pointer;"
                            @click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
                        <span v-else>{{scope.row[a.label]}}</span>
                    </template>
                </el-table-column>
                <el-table-column fixed="right" align="center" label="操作" :width="getWidth()"
                    v-if="data.do.length > 0">
                <el-table-column fixed="right" align="center" label="操作" :width="getWidth()" v-if="data.do.length > 0">
                    <template slot-scope="scope">
                        <el-button v-for="(a, ai) in data.do" :key="ai" :type="a.type"
              :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false"
@@ -105,19 +119,21 @@
            </el-pagination>
        </div>
        <el-dialog title="编辑" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'">
            <div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 0;">
            <div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
                <div v-if="data.row > 1">
                    <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
                        <el-col :span="6/data.row" style="text-align: right;">
                        <el-col :span="6/data.row" style="text-align: right;" :offset="1">
                            <span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}：
                        </el-col>
                        <el-col :span="16/data.row" :offset="1">
                        <el-col :span="16/data.row">
                            <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`请输入${a.value}`"
                                v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
                            <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
                                style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
                            <el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
                                v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
                                clearable>
                                <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                    :label="b.label"></el-option>
                                    :label="b.label">
                                </el-option>
                            </el-select>
                        </el-col>
                    </div>
@@ -130,8 +146,9 @@
                        <el-col :span="16" :offset="1">
                            <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`请输入${a.value}`"
                                v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
                            <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
                                style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
                            <el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
                                v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
                                clearable>
                                <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                    :label="b.label"></el-option>
                            </el-select>
@@ -390,6 +407,15 @@
                    this.total = res.data.body.total
                    this.tableHead = res.data.head
                    this.tableData = res.data.body.records
                    for (var a in this.data.selectField) {
                        if (this.data.selectField[a].choose == true) {
                            this.tableData.map(b => {
                                try {
                                    b[a] = JSON.parse(b[a])
                                } catch (e) {}
                            })
                        }
                    }
                    this.loading = false
                }).catch(e => {
                    this.loading = false
@@ -454,7 +480,7 @@
                        delete this.upData.createUser
                        delete this.upData.updateUser
                        val.field.forEach(a => {
                            if (this.upData[a] == undefined) {
                            if (this.upData[a] === undefined) {
                                this.upHead.push({
                                    value: a.split('=')[0],
                                    label: a.split('=')[1]
@@ -496,7 +522,6 @@
                } else {
                    delete row.orderBy
                    this.$parent[val.method](row)
                    // this.$emit(val.method, row)
                }
            },
            saveUpData() {
@@ -515,6 +540,11 @@
                    }
                }
                this.upLoad = true
                for (var a in this.data.selectField) {
                    if (this.data.selectField[a].choose == true) {
                        this.upData[a] = JSON.stringify(this.upData[a])
                    }
                }
                this.$axios.post(this.upUrl, this.upData, {
                    headers: {
                        'Content-Type': 'application/json'

 src/components/view/a5-capacity-scope.vue

@@ -162,7 +162,9 @@
                        templateId:{
                            select:[]
                        },
                        sonLaboratory: {select:[]}
                        sonLaboratory: {select:[]},
                        unit: {select:[]},
                        sample: {select:[]},
                    },
                    selectField: {
                        inspectionItemType: {
@@ -180,10 +182,11 @@
                        templateId:{
                            select:[]
                        },
                        method:{select:[]},
                        method:{select:[],choose: true},
                        deviceGroup:{select:[]},
                        sample: {select:[]},
                        sonLaboratory: {select:[]}
                        sonLaboratory: {select:[]},
                        unit: {select:[]}
                    },
                    requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','sample'],
                    requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','sample']
@@ -237,6 +240,7 @@
            this.selectTestObjectByName()
            this.getStandardTemplate()
            this.selectEnumByCategoryForSLaboratory()
            this.selectEnumByCategoryForUnit()
            this.getPower('0')
        },
        methods: {
@@ -321,6 +325,14 @@
                    this.itemParameterData.tagField.sonLaboratory.select = res.data
                })
            },
            selectEnumByCategoryForUnit() {
                this.$axios.post(this.$api.enums.selectEnumByCategory, {
                    category: "单位"
                }).then(res => {
                    this.itemParameterData.selectField.unit.select = res.data
                    this.itemParameterData.tagField.unit.select = res.data
                })
            },
            obtainItemParameterList() {
                this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
                    let data = []
@@ -353,10 +365,12 @@
                    res.data.forEach(a => {
                        data.push({
                            label: a.specimenName,
                            value: a.specimenName
                            value: a.id,
                            type: 'success'
                        })
                    })
                    this.itemParameterData.selectField.sample.select = data
                    this.itemParameterData.tagField.sample.select = data
                })
            },
            getStandardTemplate() {

 src/components/view/a7-standard-method.vue

ÎļþÃû´Ó src/components/view/standard_method.vue ÐÞ¸Ä
@@ -42,7 +42,7 @@
            <el-row class="title">
                <el-col :span="12" style="padding-left: 20px;">标准方法</el-col>
                <el-col :span="12" style="text-align: right;">
                    <!-- <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">新增</el-button> -->
                    <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">新增</el-button>
                </el-col>
            </el-row>
        </div>
@@ -63,7 +63,8 @@
            </div>
        </div>
        <div class="table">
            <ValueTable ref="ValueTable" :url="$api.standardMethod.selectStandardMethodList" :componentData="componentData" :key="upIndex"/>
            <ValueTable ref="ValueTable" :url="$api.standardMethod.selectStandardMethodList"
            :delUrl="$api.standardMethod.delStandardMethod" :upUrl="$api.standardMethod.upStandardMethod" :componentData="componentData" :key="upIndex"/>
        </div>
    </div>
</template>
@@ -93,17 +94,21 @@
                        font: '编辑',
                        type: 'text',
                        method: 'doDiy',
                        field:['createUserName','updateUserName']
                        field:['sampleType','createUserName','updateUserName','检验对象=structureTestObjectId']
                    },{
                        id: 'delete',
                        font: '删除',
                        type: 'text',
                        method: 'doDiy'
                    }],
                    tagField: {},
                    selectField: {},
                    requiredAdd:['code','name'],
                    requiredUp:['code','name']
                    tagField: {
                        structureTestObjectId:{select: []}
                    },
                    selectField: {
                        structureTestObjectId:{select: []}
                    },
                    requiredAdd:['code','name','structureTestObjectId'],
                    requiredUp:['code','name','structureTestObjectId']
                },
                entityCopy: {},
                upIndex: 0,
@@ -114,6 +119,7 @@
        mounted() {
            this.entityCopy = this.HaveJson(this.componentData.entity)
            this.getPower()
            this.selectTestObjectByName()
        },
        methods: {
            refreshTable() {
@@ -130,9 +136,15 @@
                let del = false
                let add = false
                for (var i = 0; i < power.length; i++) {
                    /* if(power[i].menuMethod=='addEnum'){
                    if(power[i].menuMethod=='addStandardMethod'){
                        add = true
                    } */
                    }
                    if(power[i].menuMethod=='delStandardMethod'){
                        del = true
                    }
                    if(power[i].menuMethod=='upStandardMethod'){
                        up = true
                    }
                }
                if(!del){
                    this.componentData.do.splice(1, 1)
@@ -141,7 +153,23 @@
                    this.componentData.do.splice(0, 1)
                }
                this.addPower = add
            }
            },
            openAdd(){
                this.$refs.ValueTable.openAddDia(this.$api.standardMethod.addStandardMethod);
            },
            selectTestObjectByName() {
                this.$axios.get(this.$api.capacityScope.selectTestObjectByName).then(res => {
                    let data = []
                    res.data.forEach(a => {
                        data.push({
                            label: a.specimenName,
                            value: a.id
                        })
                    })
                    this.componentData.selectField.structureTestObjectId.select = data
                    this.componentData.tagField.structureTestObjectId.select = data
                })
            },
        }
    }
</script>

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

@@ -54,7 +54,7 @@
        border-radius: 8px 0 0 8px;
    }

    .tab li:nth-child(4) {
    .tab li:nth-child(5) {
        border-radius: 0 8px 8px 0;
    }

@@ -218,7 +218,7 @@
                    entity: {
                        entrustCode: null,
                        sample: null,
                        state: 1,
                        state: 0,
                        orderBy: {
                            field: 'id',
                            order: 'asc'
@@ -260,7 +260,7 @@
                            return row.state == 2 || row.state == 3
                        }
                    }, {
                        font: '下发',
                        font: '分配',
                        type: 'text',
                        method: 'handleIssued',
                        disabFun: (row, index) => {
@@ -333,12 +333,15 @@
                addPower: true,
                upLoad: false,
                tabList: [{
                        label: '检验处理',
                        label: '待审核',
                        value: 0
                    }, {
                        label: '待检验',
                        value: 1
                    },
                    {
                        label: '待审核',
                        value: 0
                        label: '已检验',
                        value: 4
                    },
                    {
                        label: '退回',
@@ -429,8 +432,7 @@
                this.dataDialogVisible = true;
            },
            // ä¸‹è½½æŠ¥å‘Š
            download(row) {
            },
            download(row) {},
            // å®¡æ ¸
            handleVerify(row) {
                // this.verifyDialogVisible = true;

 src/components/view/b2-standard.vue

@@ -54,6 +54,7 @@
        height: calc(100% - 275px);
        margin-top: 5px;
        background-color: white;
        user-select: none;
    }

    .product_table .el-table {
@@ -83,6 +84,10 @@
    .standard .standard_table .el-table__row .cell {
        font-size: 14px;
    }

    .standard .el-table .warning-row .cell {
        color: #bababa;
    }
</style>

<template>
@@ -97,9 +102,10 @@
                    <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addDia = true"></el-button>
                </el-col>
            </el-row>
            <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }"
                node-key="label" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current
                @node-expand="nodeOpen" @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="true" :default-expanded-keys="expandedKeys">
            <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }" node-key="label"
                :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
                @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false"
                :default-expanded-keys="expandedKeys">
                <div class="custom-tree-node" slot-scope="{ node, data }">
                    <el-row>
                        <el-col :span="21">
@@ -120,17 +126,18 @@
            <el-row class="title">
                <el-col :span="10" style="font-size: 14px;color: #999;">{{selectTree}}</el-col>
                <el-col :span="selectTree==''?24:14" style="text-align: right;" v-if="selectTree!=''">
                    <el-button size="small" type="primary" @click="addStandardDia = true"
                    <!-- <el-button size="small" type="primary" @click="addStandardDia = true"
                        v-if="addStandardMethod">新增标准</el-button>
                    <el-button size="small" type="primary" @click="addProductDia = true" v-if="addStandardProduct">新增项目</el-button>
                    <el-button size="small" @click="delStandardProductByIds" v-if="delStandardProduct">
                        <i class="el-icon-delete" style="color: #3A7BFA;"></i>
                        <span style="color: #3A7BFA;">删除</span>
                    </el-button>
                    </el-button> -->
                </el-col>
            </el-row>
            <el-row class="standard_table" v-loading="tableLoad">
                <el-table class="el-table" :data="standardList" style="width: 100%;" height="220px" tooltip-effect="dark">
                <el-table class="el-table" :data="standardList" style="width: 100%;" height="220px" tooltip-effect="dark"
                    highlight-current-row @row-click="rowClick">
                    <el-table-column prop="code" label="标准编号" show-overflow-tooltip>
                        <template slot-scope="scope">
                            <span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
@@ -140,34 +147,45 @@
                    <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">
                    <!-- <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-column> -->
                </el-table>
            </el-row>
            <el-row class="product_table" v-loading="tableLoad">
                <el-table :data="productList" style="width: 100%;" height="100%" tooltip-effect="dark" stripe :fit="true" border
                    @selection-change="handleSelectionChange">
            <el-row class="product_table" v-loading="tableLoad2">
                <el-table :data="productList" ref="productTable" style="width: 100%;" height="100%" tooltip-effect="dark" stripe :fit="true" border
                    @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" @select="upProductSelect">
                    <el-table-column type="selection" width="65"></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> -->
                    <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140"
                        show-overflow-tooltip></el-table-column>
                    <el-table-column prop="sonLaboratory" label="子实验室" width="130" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="unit" label="计量单位" width="100" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="price" label="单价" width="100" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="manHour" label="工时" width="80" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="manHourGroup" label="工时分组" width="100" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="deviceGroup" label="设备组" width="120" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="section" label="区间" width="120" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="ask" label="要求值" min-width="220px">
                    <el-table-column prop="ask" label="要求值" min-width="200px">
                        <template slot-scope="scope">
                            <el-input size="small" placeholder="要求值" v-model="scope.row.ask" clearable
                                @change="(value)=>upStandardProductList(value,scope.row.id)" v-if="upStandardProduct" type="textarea" :autosize="{ minRows: 1, maxRows: 3}"></el-input>
                                @change="(value)=>upStandardProductList(value,scope.row.id)" v-if="upStandardProduct" type="textarea"
                                :autosize="{ minRows: 1, maxRows: 3}"></el-input>
                            <span v-else>{{scope.row.ask}}</span>
                        </template>
                    </el-table-column>
                    <el-table-column prop="tell" label="要求描述" min-width="220px">
                        <template slot-scope="scope">
                            <el-input size="small" placeholder="要求描述" v-model="scope.row.tell" clearable
                                @change="(value)=>upStandardProductListOfTell(value,scope.row.id)" v-if="upStandardProduct" type="textarea"
                                :autosize="{ minRows: 1, maxRows: 3}"></el-input>
                            <span v-else>{{scope.row.ask}}</span>
                        </template>
                    </el-table-column>
                    <el-table-column prop="method" label="试验方法" width="100" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="unit" label="计量单位" width="100" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="price" label="单价(元)" width="90" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="manHour" label="工时(H)" width="90" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="manHourGroup" label="工时分组" width="100" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="deviceGroup" label="设备组" width="120" show-overflow-tooltip></el-table-column>
                    <el-table-column prop="section" label="区间" width="120" show-overflow-tooltip></el-table-column>
                </el-table>
            </el-row>
        </div>
@@ -289,6 +307,7 @@
                addLoad2: false,
                productList: [],
                tableLoad: false,
                tableLoad2: false,
                upStandardProduct: false,
                delStandardMethod: false,
                selects: [],
@@ -322,7 +341,9 @@
                        inspectionValueType:{
                            select:[]
                        },
                        deviceGroup:{select:[]}
                        deviceGroup: {
                            select: []
                        }
                    },
                    selectField: {},
                },
@@ -465,10 +486,10 @@
                    this.list = res.data
                    this.list.forEach(a=>{
                        a.children.forEach(b=>{
                            /* b.children.forEach(c=>{
                            b.children.forEach(c => {
                                this.expandedKeys.push(c.label)
                            }) */
                            this.expandedKeys.push(b.label)
                            })
                            // this.expandedKeys.push(b.label)
                        })
                    })
                    this.treeLoad = false
@@ -569,7 +590,6 @@
                }).then(res => {
                    this.tableLoad = false
                    this.standardList = res.data.standardMethodList
                    this.productList = res.data.standardProductList
                })
            },
            getPower() {
@@ -616,6 +636,22 @@
                this.$axios.post(this.$api.standardTree.upStandardProductList, {
                    id: index,
                    ask: value
                }, {
                    headers: {
                        'Content-Type': 'application/json'
                    }
                }).then(res => {
                    if (res.code == 201) {
                        this.$message.error('未保存')
                        return
                    }
                    this.$message.success('已保存')
                })
            },
            upStandardProductListOfTell(value, index) {
                this.$axios.post(this.$api.standardTree.upStandardProductList, {
                    id: index,
                    tell: value
                }, {
                    headers: {
                        'Content-Type': 'application/json'
@@ -696,7 +732,50 @@
                    this.selectsStandardMethodByFLSSM()
                })
                this.addProductDia = false
            },
            rowClick(row, column, event) {
                this.tableLoad2 = true
                this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
                    id: row.id
                }).then(res => {
                    this.productList = res.data
                    setTimeout(() => {
                        this.productList.forEach(a => {
                            if (a.state == 1) this.toggleSelection(a)
                        })
                    }, 300)
                    this.tableLoad2 = false
                })
            },
            toggleSelection(row) {
                this.$refs.productTable.toggleRowSelection(row, true);
            },
            tableRowClassName({
                row,
                rowIndex
            }) {
                if (row.state === 0) {
                    return 'warning-row';
            }
                return '';
            },
            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'
                    }
                }).then(res => {
                    if (res.code == 201) {
                        this.$message.error('未保存')
                        return
                    }
                    this.$message.success('已保存')
                })
            },
        }
    }
</script>

 static/js/menu.js

@@ -543,7 +543,7 @@
        }, {
            v: "实验室的检测能力档案",
            i: "font icon-erjidaohang",
            u: "standard_method",
            u: "a7-standard-method",
            g: "7.2 æ–¹æ³•çš„选择、验证和确认",
            p: "selectStandardMethodList"
        }, {