Merge branch 'master' of http://192.168.110.209:9001/r/lims-before

zouyu

2023-08-31 675420f7779ccf72bf81df11c25ba2549c2fd89d

 src/views/experiment/inspectionApplication/index.vue

@@ -50,7 +50,8 @@
                  </div>
               </div>
               <div class="table-box">
                  <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600" :cell-style="{textAlign: 'center'}"
                  <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
                     :cell-style="{textAlign: 'center'}"
                     :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                     :data="inspectionTable">
                     <el-table-column type="selection" min-width="30px" />
@@ -63,8 +64,8 @@
                        </template>
                     </el-table-column>
                     <el-table-column prop="formTime" label="来料日期" min-width="90px" />
                     <el-table-column prop="supplier" label="供应商名称" min-width="150px" show-overflow-tooltip/>
                     <el-table-column prop="mcode" label="原材料编码" min-width="170px"/>
                     <el-table-column prop="supplier" label="供应商名称" min-width="150px" show-overflow-tooltip />
                     <el-table-column prop="mcode" label="原材料编码" min-width="170px" />
                     <el-table-column prop="name" label="原材料名称" min-width="80px" />
                     <el-table-column prop="specifications" label="规格型号" min-width="160px" />
                     <el-table-column prop="unit" label="单位" min-width="50px" />
@@ -72,8 +73,10 @@
                     <el-table-column prop="createTime" label="登记日期" min-width="80px" />
                     <el-table-column prop="inspection_status" label="检验结果" min-width="80px">
                        <template slot-scope="scope">
                           <el-tag class="tag" type="danger" disable-transitions v-if="scope.row.inspection_status == 0">不合格</el-tag>
                           <el-tag class="tag" type="success" disable-transitions v-else-if="scope.row.inspection_status == 1">合格</el-tag>
                           <el-tag class="tag" type="danger" disable-transitions
                              v-if="scope.row.inspection_status == 0">不合格</el-tag>
                           <el-tag class="tag" type="success" disable-transitions
                              v-else-if="scope.row.inspection_status == 1">合格</el-tag>
                        </template>
                     </el-table-column>
                     <el-table-column prop="userName" label="登记人" min-width="80px" />
@@ -81,7 +84,7 @@
                     <el-table-column label="操作" min-width="150" fixed="right">
                        <template slot-scope="scope">
                           <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button>
                           <el-button type="text" size="small">作废</el-button>
                           <el-button type="text" size="small" @click="delInspect(scope.row)">作废</el-button>
                        </template>
                     </el-table-column>
                  </el-table>
@@ -311,18 +314,17 @@
                  </el-select>
               </template>
            </el-card>
            <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
                  height="calc(40vh)" default-expand-all ref="multipleTable"
                  :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                  <el-table-column type="index" width="50px" label="序号"></el-table-column>
                  <el-table-column prop="name" label="项目名称" sortable>
                  </el-table-column>
                  <el-table-column prop="unit" label="单位" sortable></el-table-column>
                  <el-table-column prop="required" label="标准值" sortable>
                  </el-table-column>
                  <el-table-column prop="internal" label="内控值" sortable>
                  </el-table-column>
               </el-table>
            <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border height="calc(40vh)"
               default-expand-all ref="multipleTable" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
               <el-table-column type="index" width="50px" label="序号"></el-table-column>
               <el-table-column prop="name" label="项目名称" sortable>
               </el-table-column>
               <el-table-column prop="unit" label="单位" sortable></el-table-column>
               <el-table-column prop="required" label="标准值" sortable>
               </el-table-column>
               <el-table-column prop="internal" label="内控值" sortable>
               </el-table-column>
            </el-table>
            <span slot="footer" class="dialog-footer">
               <el-button @click="Standardframe = false">取 消</el-button>
               <el-button type="primary" @click="GOfrom">确 定</el-button>
@@ -413,6 +415,7 @@
      addInspect,
      chooseVer,
      lookProByVer,
      delInspect
   } from '@/api/experiment/planAssignments'
   export default {
      data() {
@@ -490,14 +493,13 @@
            tableRow: {},
            BANben: [],
            version: null,
            listdata:[],
            ddd:{}
            listdata: [],
            ddd: {}
         }
      },
      watch: {
         $route: {
            handler(val, oldval) {
            },
            handler(val, oldval) {},
            // 深度观察监听
            deep: true
         }
@@ -538,7 +540,7 @@
               specifications: this.tmp.specifications
            })
            this.BANben = []
            res.data.forEach(a=>{
            res.data.forEach(a => {
               this.BANben.push('V ' + a)
            })
            this.version = this.BANben[0]
@@ -647,12 +649,12 @@
                  selectAll({
                     type: 0
                  }).then(res => {
                       var data = res.data
                     data.forEach((item)=>{
                       var checkdate = []
                       checkdate.push(item['createTime'])
                       checkdate.push(item['updateTime'])
                       item['checkdate'] = checkdate // 检验日期
                     var data = res.data
                     data.forEach((item) => {
                        var checkdate = []
                        checkdate.push(item['createTime'])
                        checkdate.push(item['updateTime'])
                        item['checkdate'] = checkdate // 检验日期
                     })
                     this.rawMaterialTable = res.data
                  })
@@ -662,11 +664,11 @@
                     type: 2
                  }).then(res => {
                     var data = res.data
                     data.forEach((item)=>{
                       var checkdate = []
                       checkdate.push(item['createTime'])
                       checkdate.push(item['updateTime'])
                       item['checkdate'] = checkdate // 检验日期
                     data.forEach((item) => {
                        var checkdate = []
                        checkdate.push(item['createTime'])
                        checkdate.push(item['updateTime'])
                        item['checkdate'] = checkdate // 检验日期
                     })
                     this.commisionTable = res.data
                  })
@@ -674,9 +676,9 @@
            }, 100)
         },
         // 新增检验
         async addInspection() {  
         async addInspection() {
            if (this.type === 0) {
               addInspect({ 
               addInspect({
                  endTime: this.infoForm.checkdate[1],
                  formTime: this.infoForm.formTime,
                  mcode: this.infoForm.mcode,
@@ -687,8 +689,8 @@
                  supplier: this.infoForm.supplier,
                  type: this.type,
                  unit: this.infoForm.unit,
                  version:this.version.replace('V ', '')
               }).then(res=>{
                  version: this.version.replace('V ', '')
               }).then(res => {
                  this.$message({
                     message: '添加成功！',
                     type: 'success'
@@ -708,7 +710,7 @@
                  supplier: this.commisionSelection.supplier,
                  type: this.type,
                  unit: this.commisionSelection.unit,
                  version:this.version
                  version: this.version
               })
            }
            if (this.type === 2) {
@@ -723,7 +725,7 @@
                  supplier: this.finishedTable.supplier,
                  type: this.type,
                  unit: this.finishedTable.unit,
                  version:this.version
                  version: this.version
               })
            }
            this.type = 0
@@ -750,7 +752,7 @@
         //    console.log(this.infoForm);

         //    if (infoForm.checkdate == undefined) {
            //         alert('请输入检验时间');
         //         alert('请输入检验时间');
         //       return false;
         //    }
         //    // 校验通过
@@ -758,10 +760,10 @@
         // },
         //确定跳转
         QUEding() {
            if (this.infoForm.checkdate[0] == undefined||this.infoForm.checkdate[1] == undefined) {
            if (this.infoForm.checkdate[0] == undefined || this.infoForm.checkdate[1] == undefined) {
               this.$message({
               message: '请选择检验时间',
               type: 'warning'
                  message: '请选择检验时间',
                  type: 'warning'
               });
               return;
            }
@@ -776,13 +778,15 @@
         },
         //確定詳情頁
         async GOfrom() {
               // this.addInspect()
               this.addInspection()
                  // this.kk = res.data
                  console.log(this.kk)
                  // this.$router.push({name: 'Viewdetails',query: {id: res.data}})
                  // console.log(res);
			
            this.addInspection()
         },
         delInspect(row){
            delInspect({
               id: row.id
            }).then(res=>{
               this.$message.success('已作废')
               this.selectInspectsList()
            })
         }
      }
   }