功能调整

李林

2024-03-20 353be10ef4c7241d32c16700c7e6d36287a45f90

功能调整

 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,10 +88,12 @@
            <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">
@@ -99,7 +101,8 @@
                    </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" 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>
@@ -138,6 +141,42 @@
                    </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>
                <el-col class="search_thing" :span="6">
                    <div class="search_label">OTC订单号：</div>
                    <div class="search_input">
                        <el-input size="small" placeholder="请输入" clearable v-model="addObj.otcCode"></el-input>
@@ -162,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">
@@ -210,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>
@@ -416,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,
@@ -427,6 +503,7 @@
                    model: null,
                    sampleNum: 1,
                    isLeave: 0,
                    unit: null
                },
                type: [],
                selectUserDia: false,
@@ -480,6 +557,16 @@
        },
        personList:[],
        upLoad:false,
                units: [],
                models: [],
                methods: [],
                methodLoad: false
            }
        },
        watch: {
            sampleList() {
                this.addObj.method = null
                this.productList = []
            }
        },
        mounted() {
@@ -488,6 +575,7 @@
            this.selectStandardTreeList()
      this.selectInsOrderTemplate()
      this.getAuthorizedPerson();
            this.selectEnumByCategoryForUnit()
      if(this.active==1){
        // 下单流程
      }else {
@@ -496,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(()=>{
@@ -646,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(' - ')
@@ -681,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 = []
@@ -703,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,
@@ -740,7 +873,7 @@
                        sampleNum: 1,
                        isLeave: 0,
                    }
                })
                }) */
            },
            delSample() {
                this.sampleIds.forEach(a => {
@@ -766,7 +899,7 @@
                    this.productList.forEach(a => {
                        if (a.state == 1) this.toggleSelection(a)
                    })
                }, 300)
                }, 200)
            },
            toggleSelection(row) {
                this.$refs.productTable.toggleRowSelection(row, true);
@@ -815,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'
@@ -844,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/view/b2-standard.vue

@@ -590,7 +590,6 @@
                }).then(res => {
                    this.tableLoad = false
                    this.standardList = res.data.standardMethodList
                    this.productList = res.data.standardProductList
                })
            },
            getPower() {