From fa20b549442bcfe92f564108a577fc398ed6427a Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 9 Oct 2025 17:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E4=B9=A6=E5=86=99?=
 =?UTF-8?q?=E5=8F=8A=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../periodicTesting/components/viewDialog.vue | 215 +++++++++++++++
 src/views/periodicTesting/testProject.vue     | 243 ++++++++++++++++-
 src/views/periodicTesting/testTask.vue        | 251 ++++++++++++++++--
 .../tankSolutionTaskAssignment.vue            |   3 +-
 .../tankSolutionTaskDispose.vue               |   8 +-
 5 files changed, 695 insertions(+), 25 deletions(-)
 create mode 100644 src/views/periodicTesting/components/viewDialog.vue

diff --git a/src/views/periodicTesting/components/viewDialog.vue b/src/views/periodicTesting/components/viewDialog.vue
new file mode 100644
index 0000000..fd883b5
--- /dev/null
+++ b/src/views/periodicTesting/components/viewDialog.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-dialog title="检验结果填报" append-to-body :modelValue="showDialog" width="80%" @close="closeDialog">
+    <div style="height: 600px;overflow-y: auto;overflow-x:hidden ;">
+        <div style="font-weight: 550;">任务信息</div>
+        <div class="info_box">
+            <el-row class="item_item" :gutter="20">
+                <el-col :span="6">
+                    <span>任务编号：</span><span>{{detailForm.trNum}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>试验项目：</span><span>{{detailForm.textProject.tpProject}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>试验件：</span><span>{{detailForm.testPieceTitle}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>试验标准：</span><span style="color: #1890ff;">{{detailForm.textProject.tpStandard}}</span>
+                </el-col>
+            </el-row>
+            <el-row class="item_item" :gutter="20">
+                <el-col :span="6">
+                    <span>试验条件：</span><span>{{detailForm.textProject.tpCondition}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>主管工艺：</span><span>{{detailForm.craftMan.userName}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>试验员：</span><span>{{detailForm.mecMan.userName}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>任务状态：</span><span>{{detailForm.trStatusName}}</span>
+                </el-col>
+            </el-row>
+            <el-row class="item_item" :gutter="20">
+                <el-col :span="6">
+                    <span>任务生成时间：</span><span>{{detailForm.createTime}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>任务下发时间：</span><span>{{detailForm.issueTime}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>任务接收时间：</span><span>{{detailForm.receiveTime}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>任务完成时间：</span><span>{{detailForm.finishTime}}</span>
+                </el-col>
+            </el-row>
+        </div>
+        <div style="font-weight: 550;">试验结果</div>
+        <div class="info_box">
+            <el-row class="item_item" :gutter="20">
+                <el-col :span="6">
+                    <span>试验报告：</span><span style="color: #1890FF;cursor: pointer;">{{detailForm.testFile.fileName}}</span>
+                </el-col>
+                <el-col :span="6">
+                    <span>试验时间：</span><span>{{detailForm.testTime}}</span>
+                </el-col>
+            </el-row>
+            <el-row class="item_item" :gutter="20" v-show="detailForm.isTest == 0">
+                <el-col :span="6">
+                    <span>未试验原因：</span><span>{{detailForm.meterNum}}</span>
+                </el-col>
+            </el-row>
+        </div>
+    </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="closeDialog">取 消</el-button>
+                <el-button type="primary" @click="submit">确 定</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script>
+export default {
+    props:{
+        showDialog: {
+            type: Boolean,
+            default: false
+        },
+        rowId:{
+            type:Number,
+            default:0
+        },
+        rowObj:{
+            type:Object,
+            default:{}
+        },
+        dialogType:{
+            type:String,
+            default:''
+        }
+    },
+    data(){
+        return{
+            detailForm:{},
+            initialInspectionForm:{},
+            auditForm:{},
+            drugForm:{},
+            recheckForm:{},
+            userData:[
+              {
+                "jobName": "软件工程师",
+                "deptName": "MES开发部",
+                "ldapName": null,
+                "userSex": 1,
+                "deptId": 1,
+                "mobile": null,
+                "userName": "测试",
+                "userId": 521,
+                "userCode": "0001"
+              },
+              {
+                "jobName": null,
+                "deptName": "MES开发部",
+                "ldapName": "jinna",
+                "userSex": 2,
+                "deptId": 1,
+                "mobile": null,
+                "userName": "靳娜",
+                "userId": 21,
+                "userCode": "jinna"
+              },
+              {
+                "jobName": null,
+                "deptName": "MES开发部",
+                "ldapName": "zd001",
+                "userSex": 1,
+                "deptId": 1,
+                "mobile": null,
+                "userName": "张迪",
+                "userId": 601,
+                "userCode": "zd001"
+              }
+            ],
+            initialInspectionFormRules:{
+                isTest:[{required:true,message:'请选择是否进行化验',trigger:'blur'}],
+                meterNum:[{required:true,message:'请输入测量值',trigger:'blur'}],
+                testTime:[{required:true,message:'请选择化验时间',trigger:'blur'}],
+            },
+            auditRules:{
+                isAudit:[{required:true,message:'请选择是否审核通过',trigger:'blur'}],
+            },
+            drugRules:{
+                drugBatch:[{required:true,message:'请输入药品批次',trigger:'blur'}],
+                drugRecipient:[{required:true,message:'请选择领药人',trigger:'blur'}],
+            },
+            recheckRules:{
+                isTest:[{required:true,message:'请选择是否进行化验',trigger:'blur'}],
+                meterNum:[{required:true,message:'请输入测量值',trigger:'blur'}],
+                testTime:[{required:true,message:'请选择化验时间',trigger:'blur'}],
+            }
+        }
+    },
+    mounted(){
+        console.log('row---------------------',this.rowObj)
+        this.getDetail()
+    },
+    methods:{
+        // 获取详情数据
+        getDetail(){
+            this.detailForm = this.rowObj
+        },
+        closeDialog(){
+            this.$emit('closeDialog');
+        },
+        //输入框数字校验
+        handleMeterNum(value){
+            this.initialInspectionForm.meterNum =  value.replace(/[^\d]/g, ''); 
+        },
+        handleCondNum(value){
+            this.initialInspectionForm.condNum =  value.replace(/[^\d]/g, ''); 
+        },
+        handleActualAdd(value){
+            // 1. 过滤非法字符
+            let val = value.replace(/[^\d.]/g, '');
+            
+            // 2. 处理多个小数点
+            const dotIndex = val.indexOf('.');
+            if (dotIndex !== -1) {
+                val = val.substring(0, dotIndex + 1) + 
+                    val.substring(dotIndex + 1).replace(/\./g, '');
+            }
+
+            // 3. 限制小数点后五位
+            if (dotIndex !== -1) {
+                const decimalPart = val.split('.')
+                if (decimalPart[1] && decimalPart[1].length > 5) {
+                val = decimalPart[0] + '.' + decimalPart[1].substring(0, 5);
+                }
+            }
+            console.log('val-----------------',val)
+            this.initialInspectionForm.actualAdd = val
+        },
+        // 提交
+        submit(){
+            this.closeDialog()
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+    .info_box{
+        padding: 20px 0;
+        border-bottom: 1px solid #eee;
+        margin-bottom: 20px;
+
+        .item_item{
+            padding: 5px 0;
+        }
+    }
+
+</style>
\ No newline at end of file
diff --git a/src/views/periodicTesting/testProject.vue b/src/views/periodicTesting/testProject.vue
index 6265cc0..a50b681 100644
--- a/src/views/periodicTesting/testProject.vue
+++ b/src/views/periodicTesting/testProject.vue
@@ -1,13 +1,248 @@
 <template>
-  试验项目管理
+  <basic-container>
+    <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
+      @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"
+      @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
+      @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template #craftMan="{ row }">
+        {{ row.craftMan.userName }}
+      </template>
+      <template #mecMan="{ row }">
+        {{ row.mecMan.userName }}
+      </template>
+    </avue-crud>
+  </basic-container>
 </template>
 
 <script>
 export default {
+  data() {
+    return {
+      loading: false,
+      data: [],
+      form: {},
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        tip: false,
+        height: 'auto',
+        calcHeight: 32,
+        columnSort: true,
+        // simplePage: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: false,
+        delBtn: false,
+        addBtn: false,
+        editBtn: false,
+        editBtnText: '修改',
+        viewBtnText: '详情',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        labelWidth: 120,
+        // menuWidth: 330,
+        dialogWidth: 600,
+        dialogClickModal: false,
+        searchEnter: true,
+        filterBtn: true,
+        searchShowBtn: false,
+        excelBtn: true,
+        showOverflowTooltip: true,
+        align: 'center',
+        column: [
+          {
+            label: '试验项目',
+            prop: 'tpProject',
+            search: false,
+            sortable: true,
+            filter: true,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            span: 24,
+            width: 200,
+            rules: [
+              {
+                required: true,
+                message: '请输入试验项目',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '试验条件',
+            prop: 'tpCondition',
+            search: false,
+            sortable: true,
+            filter: true,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            span: 24,
+            width: 200,
+            rules: [
+              {
+                required: true,
+                message: '请输入试验条件',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '试验标准',
+            prop: 'tpStandard',
+            search: false,
+            sortable: true,
+            filter: true,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            span: 24,
+            width: 200,
+            rules: [
+              {
+                required: true,
+                message: '请输入试验标准',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '试验件',
+            prop: 'testPieceTitle',
+            type: 'select',
+            search: false,
+            sortable: true,
+            filter: true,
+            span: 24,
+            width: 200,
+            dicData: [
+              {
+                label: '零件',
+                value: 1
+              },
+              {
+                label: '试片',
+                value: 0
+              }
+            ]
+          },
+          {
+            label: '主管工艺',
+            prop: 'craftMan',
+            search: false,
+            sortable: true,
+            filter: true,
+            span: 24,
+            width: 200,
+          },
+          {
+            label: '试验员',
+            prop: 'mecMan',
+            search: false,
+            sortable: true,
+            editDisplay: false,
+            filter: true,
+            addDisplay: false,
+            span: 24,
+            width: 200,
+            rules: [
+              {
+                required: true,
+                message: '请输入试验员',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '试验周期',
+            prop: 'textCycle',
+            search: false,
+            sortable: true,
+            filter: true,
+            span: 24,
+            width: 200,
+          },
+          {
+            label: '提前下发天数',
+            prop: 'beforeDays',
+            search: false,
+            sortable: true,
+            filter: true,
+            span: 24,
+            width: 200,
+          },
+          {
+            label: '超期提醒天数',
+            prop: 'remDays',
+            search: false,
+            sortable: true,
+            filter: true,
+            span: 24,
+            width: 200,
+          },
+          {
+            label: '更新时间',
+            prop: 'updateTime',
+            search: false,
+            sortable: true,
+            filter: true,
+            span: 24,
+            width: 200,
+          },
+        ]
+      }
+    }
+  },
+  mounted() {
 
+  },
+  methods: {
+    onLoad() {
+      this.data = [
+        {
+          id: 1, tpProject: '盐雾试验', tpCondition: '32小时', tpStandard: 'xxxx标准',
+          testPieceTitle: '零件', testPiece: 0,
+          craftMan: { userName: '张三' },
+          mecMan: { userName: '李四' },
+          textCycle:'一年四次',beforeDays:20,remDays:7,updateTime:'2024-10-11 12:32:11'
+        },
+        {
+          id: 2, tpProject: '盐雾试验', tpCondition: '32小时', tpStandard: 'xxxx标准',
+          testPieceTitle: '零件', testPiece: 0,
+          craftMan: { userName: '张三' },
+          mecMan: { userName: '李四' },
+          textCycle:'一年四次',beforeDays:20,remDays:7,updateTime:'2024-10-11 12:32:11'
+        },
+        {
+          id: 3, tpProject: '盐雾试验', tpCondition: '32小时', tpStandard: 'xxxx标准',
+          testPieceTitle: '零件', testPiece: 0,
+          craftMan: { userName: '张三' },
+          mecMan: { userName: '李四' },
+          textCycle:'一年四次',beforeDays:20,remDays:7,updateTime:'2024-10-11 12:32:11'
+        },
+        {
+          id: 4, tpProject: '盐雾试验', tpCondition: '32小时', tpStandard: 'xxxx标准',
+          testPieceTitle: '零件', testPiece: 0,
+          craftMan: { userName: '张三' },
+          mecMan: { userName: '李四' },
+          textCycle:'一年四次',beforeDays:20,remDays:7,updateTime:'2024-10-11 12:32:11'
+        },
+      ]
+      this.page.total = this.data.length
+    }
+  }
 }
 </script>
 
-<style>
-
-</style>
\ No newline at end of file
+<style></style>
\ No newline at end of file
diff --git a/src/views/periodicTesting/testTask.vue b/src/views/periodicTesting/testTask.vue
index 560c5ec..d97a126 100644
--- a/src/views/periodicTesting/testTask.vue
+++ b/src/views/periodicTesting/testTask.vue
@@ -18,13 +18,24 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"  
     >
+        <template #menu-left>
+            <el-button   @click="handleIssue" type="primary">
+                <el-icon style="margin-right: 5px;"><Pointer /></el-icon>
+                批量下发
+            </el-button>
+        </template>
+        <template #menu-right="{ size }">
+        <el-button type="warning" >临期</el-button>
+        <el-button type="danger" >超期</el-button>
+        </template>
         <template #menu="scope">
-            <el-button text  @click="handleView(scope.row,'view')">详情</el-button>
-            <el-button text @click="handleView(scope.row,'add')"  v-show="scope.row.status == 1 || scope.row.status == 4">
-                填报
+            <el-button  type="text" @click="handleView(scope.row,'view')">详情</el-button>
+            <el-button type="text" @click="issueRow(scope.row,'add')"  v-show="scope.row.trStatus == 1">
+                下发
             </el-button>
-            <el-button text  v-show="scope.row.status == 3"  @click="handleView(scope.row,'drug')">领药</el-button>
-            <el-button text v-show="scope.row.status == 2"  @click="handleView(scope.row,'check')">审核</el-button>
+            <el-button type="text"  v-show="scope.row.trStatus == 3 || scope.row.trStatus == 4"  @click="handleWrite(scope.row,'drug')">填报</el-button>
+            <el-button type="text" v-show="scope.row.trStatus == 2"  @click="handleReceive(scope.row,'check')">接收</el-button>
+            <el-button type="text" v-show="scope.row.trStatus == 5"  @click="handleReport(scope.row,'check')">报告</el-button>
         </template>
         <template #tpId="{ row }">
             {{ row.textProject.tpProject }}
@@ -48,13 +59,81 @@
             </div>
         </template> 
     </avue-crud>
-    
+    <el-dialog append-to-body title="任务下发" v-model="issueDialog" width="550px">
+        <el-form ref="issueForm" :model="issueForm" label-width="80px" :rules="formRules">
+            <el-form-item label="试验员" prop="userId">
+                <el-select v-model="issueForm.userId">
+                    <el-option v-for="item in userData" :key="item.userId" :label="item.userName" :value="item.userId"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="issueDialog = false">取 消</el-button>
+                <el-button type="primary" @click="submit">确 定</el-button>
+            </span>
+        </template>
+    </el-dialog>
+    <el-dialog append-to-body title="试验填报" v-model="writeDialog" width="550px">
+        <el-form ref="writeForm" :model="writeForm" label-width="120" :rules="writeRules">
+            <el-form-item label="是否进行试验" prop="isTest">
+                <el-radio-group v-model="writeForm.isTest">
+                    <el-radio :label="1">是</el-radio>
+                    <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="试验时间" prop="testTime">
+                <el-date-picker
+                    v-model="writeForm.testTime"
+                    type="date"
+                    placeholder="请选择试验时间">
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item label="试验结果" prop="testResult">
+                <el-upload
+                    class="upload-demo"
+                    action="https://jsonplaceholder.typicode.com/posts/"
+                    :on-success="handleSuccess"
+                    :on-remove="handleRemove"
+                    multiple
+                    :limit="3"
+                    :on-exceed="handleExceed"
+                    :file-list="fileList">
+                    <div>
+                        <el-button  type="primary">点击上传</el-button>
+                        <div slot="tip" class="el-upload__tip">支持扩展名：.rar .zip .doc .docx .pdf .jpg..</div>
+                    </div>
+                    
+                </el-upload>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="writeDialog = false">取 消</el-button>
+                <el-button type="primary" @click="writeSubmit">确 定</el-button>
+            </span>
+        </template>
+    </el-dialog>
+    <view-dialog v-if="viewDialog"  :show-dialog="viewDialog" :row-id="rowId" :row-obj="rowObj" @closeDialog="closeDialog"></view-dialog>
   </basic-container>
 </template>
 
 <script>
+import viewDialog from './components/viewDialog.vue';
 export default {
+    components:{
+        viewDialog
+    },
     data(){
+        var checkFile = (rule, value, callback) => {
+            console.log('form----------------',this.writeForm)
+            console.log('form----------------',this.fileList)
+            if(this.fileList.length == 0){
+                return callback(new Error('请上传文件'));
+            }else{
+                callback()
+            }
+        };
         return{
             data:[],
             page: {
@@ -62,6 +141,14 @@ export default {
                 currentPage: 1,
                 total: 0,
             },
+            viewDialog:false,
+            fileList:[],
+            writeForm:{},
+            writeRules:{
+              isTest: [{ required: true, message: '请选择是否进行试验', trigger: 'blur' }],
+              testTime: [{ required: true, message: '请选择试验时间', trigger: 'blur' }],
+              testResult: [{ validator: checkFile, trigger: 'blur' }],
+            },
             showDialog:false,
             rowId:'',
             rowObj:{},
@@ -70,6 +157,42 @@ export default {
             formRules:{
               userId: [{ required: true, message: '请选择检测员', trigger: 'blur' }],
             },
+            userData:[
+              {
+                "jobName": "软件工程师",
+                "deptName": "MES开发部",
+                "ldapName": null,
+                "userSex": 1,
+                "deptId": 1,
+                "mobile": null,
+                "userName": "测试",
+                "userId": 521,
+                "userCode": "0001"
+              },
+              {
+                "jobName": null,
+                "deptName": "MES开发部",
+                "ldapName": "jinna",
+                "userSex": 2,
+                "deptId": 1,
+                "mobile": null,
+                "userName": "靳娜",
+                "userId": 21,
+                "userCode": "jinna"
+              },
+              {
+                "jobName": null,
+                "deptName": "MES开发部",
+                "ldapName": "zd001",
+                "userSex": 1,
+                "deptId": 1,
+                "mobile": null,
+                "userName": "张迪",
+                "userId": 601,
+                "userCode": "zd001"
+              }
+            ],
+            writeDialog:false,
             query:{},
             loading:true,
             issueForm:{},
@@ -86,7 +209,7 @@ export default {
                 tree: false,
                 border: true,
                 index: true,
-                selection: false,
+                selection: true,
                 viewBtn: false,
                 delBtn: false,
                 addBtn:false,
@@ -290,7 +413,8 @@ export default {
                     {
                         label: '任务生成时间',
                         prop: 'createTime',
-                        search: false,
+                    
+                    finishTime:'',    search: false,
                         sortable: true,
                         editDisplay:false,
                         filter: true,
@@ -305,9 +429,27 @@ export default {
                             },
                         ],
                     },
+                    {
+                        label: '任务下发时间',
+                        prop: 'issueTime',
+                        search: false,
+                        sortable: true,
+                        editDisplay:false,
+                        filter: true,
+                        addDisplay:false,
+                        span: 24,
+                        width:200,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入任务下发时间',
+                                trigger: 'blur',
+                            },
+                        ],
+                    },
                     {
                         label: '任务接成时间',
-                        prop: 'createTime',
+                        prop: 'receiveTime',
                         search: false,
                         sortable: true,
                         editDisplay:false,
@@ -324,8 +466,8 @@ export default {
                         ],
                     },
                     {
-                        label: '任务生成时间',
-                        prop: 'createTime',
+                        label: '任务完成时间',
+                        prop: 'finishTime',
                         search: false,
                         sortable: true,
                         editDisplay:false,
@@ -336,7 +478,7 @@ export default {
                         rules: [
                             {
                                 required: true,
-                                message: '请输入任务生成时间',
+                                message: '请输入任务完成时间',
                                 trigger: 'blur',
                             },
                         ],
@@ -349,16 +491,23 @@ export default {
     },
     mounted(){},
     methods:{
+        // 文件上传完成
+        handleSuccess(response, file, fileList){
+            this.fileList = fileList
+        },
+        // 文件删除
+        handleRemove(file, fileList){
+            this.fileList = fileList
+        },
         // 查看详情
         handleView(row,type){
-            this.dialogType = type
             this.rowId = row.id
             this.rowObj = row
-            this.showDialog = true
+            this.viewDialog = true
         },
         // 关闭弹窗
         closeDialog(){
-            this.showDialog = false
+            this.viewDialog = false
         },
         // 多选
         selectionChange(list) {
@@ -373,6 +522,15 @@ export default {
         },
         rowSave(row, done, loading) {
         
+        },
+        // 报告 
+        handleReport(){},
+        // 填报
+        handleWrite(){
+            this.writeForm = {}
+            this.fileList = []
+            this.writeDialog = true
+            this.$refs.writeForm.resetFields()
         },
         // 批量下发
         handleIssue(){
@@ -386,6 +544,24 @@ export default {
         issueRow(row){
             this.issueDialog = true
         },
+        // 接收
+        handleReceive(){
+            this.$confirm('确定接收此项任务?', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(() => {
+               
+            })
+        },
+        writeSubmit(){
+            this.$refs.writeForm.validate(valid => {
+                console.log('valid=============================',valid)
+                if(valid){
+                    this.writeDialog = false
+                }
+            })
+        },
         searchReset() {
             this.query = {};
             this.onLoad(this.page);
@@ -444,6 +620,15 @@ export default {
                     trStatus:1,
                     trStatusName:'待下发',
                     createTime:'2025-09-30 11:23:45',
+                    testTime:'',
+                    isTest:0,
+                    testFile:{
+                        fileName:'',
+                        fileUrl:''
+                    },
+                    finishTime:'',
+                    receiveTime:'',
+                    issueTime:'',
                     expirationDays:7
                 },
                 {
@@ -465,6 +650,15 @@ export default {
                     trStatus:2,
                     trStatusName:'待接收',
                     createTime:'2025-09-30 11:23:45',
+                    testTime:'',
+                    isTest:0,
+                    testFile:{
+                        fileName:'',
+                        fileUrl:''
+                    },
+                    finishTime:'',
+                    receiveTime:'',
+                    issueTime:'2025-10-01 11:22:12',
                     expirationDays:7
                 },
                 {
@@ -486,6 +680,15 @@ export default {
                     trStatus:3,
                     trStatusName:'待试验',
                     createTime:'2025-09-30 11:23:45',
+                    testTime:'',
+                    isTest:0,
+                    testFile:{
+                        fileName:'',
+                        fileUrl:''
+                    },
+                    finishTime:'',
+                    receiveTime:'2025-10-03 15:22:32',
+                    issueTime:'2025-10-01 11:22:12',
                     expirationDays:3
                 },
                 {
@@ -507,6 +710,15 @@ export default {
                     trStatus:4,
                     trStatusName:'已超期',
                     createTime:'2025-09-30 11:23:45',
+                    testTime:'',
+                    isTest:0,
+                    testFile:{
+                        fileName:'',
+                        fileUrl:''
+                    },
+                    finishTime:'',
+                    receiveTime:'2025-10-03 15:22:32',
+                    issueTime:'2025-10-01 11:22:12',
                     expirationDays:0
                 },
                 {
@@ -528,6 +740,15 @@ export default {
                     trStatus:5,
                     trStatusName:'已完成',
                     createTime:'2025-09-30 11:23:45',
+                    testTime:'2025-10-04 11:00:05',
+                    isTest:1,
+                    testFile:{
+                        fileName:'xxx报告',
+                        fileUrl:'xxx'
+                    },
+                    finishTime:'2025-10-04 11:12:25',
+                    receiveTime:'2025-10-03 15:22:32',
+                    issueTime:'2025-10-01 11:22:12',
                     expirationDays:''
                 },
             ]
diff --git a/src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue b/src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue
index 1abfebf..f1f6bb6 100644
--- a/src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue
+++ b/src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue
@@ -32,10 +32,9 @@
         </template>
         <template #menu="scope">
             <el-button type="text" @click="issueRow(scope.row)">
-                <el-icon style="margin-right: 5px;"><Pointer /></el-icon>
                 下发
             </el-button>
-            <el-button type="text" icon="el-icon-circle-close" @click="closeRow(scope.row)">关闭</el-button>
+            <el-button type="text"  @click="closeRow(scope.row)">关闭</el-button>
         </template>
         <template #userId="{ row }">
             {{ row.testMan.userName }}
diff --git a/src/views/tankSolutionSystem/tankSolutionTaskDispose.vue b/src/views/tankSolutionSystem/tankSolutionTaskDispose.vue
index 9eb5b00..23a0efa 100644
--- a/src/views/tankSolutionSystem/tankSolutionTaskDispose.vue
+++ b/src/views/tankSolutionSystem/tankSolutionTaskDispose.vue
@@ -19,12 +19,12 @@
       @on-load="onLoad"  
     >
         <template #menu="scope">
-            <el-button text  @click="handleView(scope.row,'view')">详情</el-button>
-            <el-button text @click="handleView(scope.row,'add')"  v-show="scope.row.status == 1 || scope.row.status == 4">
+            <el-button type="text"  @click="handleView(scope.row,'view')">详情</el-button>
+            <el-button type="text" @click="handleView(scope.row,'add')"  v-show="scope.row.status == 1 || scope.row.status == 4">
                 填报
             </el-button>
-            <el-button text  v-show="scope.row.status == 3"  @click="handleView(scope.row,'drug')">领药</el-button>
-            <el-button text v-show="scope.row.status == 2" @click="handleView(scope.row,'check')">审核</el-button>
+            <el-button type="text"  v-show="scope.row.status == 3"  @click="handleView(scope.row,'drug')">领药</el-button>
+            <el-button type="text" v-show="scope.row.status == 2" @click="handleView(scope.row,'check')">审核</el-button>
         </template>
         <template #userId="{ row }">
             {{ row.testMan.userName }}