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

Fixiaobai

2023-09-09 34a7e21b3508ac0f5f011d958210fdb7176d726b

 src/views/experiment/inspectionApplication/index.vue

@@ -53,7 +53,12 @@
                           <div v-if="scope.row.type === 1"><el-tag type="warning">成品检验</el-tag></div>
                        </template>
                     </el-table-column>
                     <el-table-column prop="formTime" label="来料日期" min-width="90px" />
                     <el-table-column prop="formTime" label="来料日期" min-width="90px">
                        <template slot-scope="scope">
                           <p v-if="scope.row.type!=1">{{scope.row.formTime}}</p>
                           <p v-else>/</p>
                        </template>
                     </el-table-column>
                     <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="90px" />
@@ -769,7 +774,7 @@
            //成品
            if (this.type === 1) {
               obj = {
                  supplier:"supplier",
                  supplier:"/",
                  formTime: "2023-09-09",
                  endTime: this.finishedTable.checkdate[1],
                  mcode: this.finishedTable.code,