qymljy 6 месяцев назад
Родитель
Сommit
54a264bc8b

+ 17 - 12
src/HDrpManagement/productInspectionMag/modules/checkInfo.vue

@@ -87,7 +87,7 @@
         <div v-else-if="scope.column.columnname == 'operation'">
           <el-button type="text" size="small" v-if="isAdd && nowIndex == scope.column.data.rowindex" @click="onSave(scope.column.data)" style="color: #e6a23c" :disabled="disabled">{{$t(`保存`)}}</el-button>
           <el-button type="text" size="small" class="inline-16" v-else @click="onEdit(scope.column.data)" :disabled="disabled">{{$t(`编辑`)}}</el-button>
-          <el-button size="small" type="text" v-if="nowIndex != scope.column.data.rowindex" style="color: #f56c6c" :disabled="disabled" @click="delInfo(scope.column.data)">{{$t(`删除`)}}</el-button>
+          <el-button size="small" type="text"  style="color: #f56c6c" :disabled="disabled" @click="delInfo(scope.column.data)">{{$t(`删除`)}}</el-button>
         </div>
         <div v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
       </template>
@@ -131,7 +131,7 @@ export default {
       isAdd:false,
       optionnameList:[],
       askList:[],
-      answerList:['合格','不合格'],
+      answerList:['/','合格','不合格'],
       nowIndex:0,
       isOptionname:'',
       isAsk:'',
@@ -160,17 +160,22 @@ export default {
       this.optionnameList = res.data
     },
     async delInfo(data){
-      const res = await this.$api.requested({
-        "content": {
-          "plm_item_jymxid": data.plm_item_jymxid
-        },
-        "id": 2025101415212502,
-      })
-      if (res.code == 0){
-        this.tool.showMessage(res,()=>{})
+      if (this.isAdd){
+        this.list.splice(this.list.length -1,1)
+        this.isAdd = false
       }else {
-        this.param.content.pageNUmber = 1
-        this.listData()
+        const res = await this.$api.requested({
+          "content": {
+            "plm_item_jymxid": data.plm_item_jymxid
+          },
+          "id": 2025101415212502,
+        })
+        if (res.code == 0){
+          this.tool.showMessage(res,()=>{})
+        }else {
+          this.param.content.pageNUmber = 1
+          this.listData()
+        }
       }
     },
     async listData(){

+ 1 - 1
src/components/normal-basic-layout/index.vue

@@ -24,7 +24,7 @@
               <!-- <el-button class="inline-16" size="small" type="primary" plain>{{$t('导 入')}}</el-button> -->
               <excel class="inline-16" :tablecols="layout" :param="param" :total="total" :specialKey="specialKey" :excelTitle="routerName" v-if="exports" :exportName="exportName" :exportValue="exportValue" :exporAdd="exporAdd"></excel>
               <exportFile :columns="columns" :param="param" :fileName="fileName" v-if="isNewExport" class="inline-16" ></exportFile>
-              <reportCenter :btnName="$t('报 表')"  position="detail" size="small" :data="reportCenterLsit.filter(item => item.type == 'datainfo')" v-if="reportCenterLsit.filter(item => item.type == 'datainfo').length > 0 && systemappid != 163">
+              <reportCenter class="inline-16" :btnName="$t('报 表')"  position="detail" size="small" :data="reportCenterLsit.filter(item => item.type == 'datainfo')" v-if="reportCenterLsit.filter(item => item.type == 'datainfo').length > 0 && systemappid != 163">
                 <template v-slot:print="scope2">
                   <el-button @click="printBtn({},scope2.data)" type="text" size="mini">{{$t('打 印')}}</el-button>
                 </template>