解决冲突文件

src/views/batchRecord/components/editModal.vue

@@ -62,7 +62,7 @@
                 >
                   <template #append>
                     <el-button size="small">选择设备</el-button>
-                  </template>
+                  </template> 
                 </el-input>
               </div>
             </el-form-item>
@@ -70,21 +70,10 @@
 
           <el-col v-if="form.itemType == '3'" :span="8">
             <el-form-item label="关联任务">
-              <!-- 下拉选择 -->
-              <el-select
-                placeholder="请选择关联任务"
-                filterable
-                clearable
-                style="width: 100%"
-                v-model="form.taskId"
-              >
-                <el-option
-                  v-for="task in []"
-                  :key="task.id"
-                  :label="task.name"
-                  :value="task.id"
-                />
-              </el-select>
+              <el-input
+                v-model="form.itemTaskName"
+                placeholder="请输入任务名称"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col v-if="form.itemType == '2'" :span="8">
@@ -134,7 +123,7 @@
             <el-table-column label="检查内容">
               <template slot-scope="scope">
                 <div>
-                  {{ scope.row.paramValue }}
+                  {{ scope.row.paramValue || scope.row.productName }}
                 </div>
               </template>
             </el-table-column>
@@ -177,7 +166,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="异常描述">
+            <el-table-column label="描述">
               <template slot-scope="scope">
                 <div>
                   <el-input
@@ -356,6 +345,19 @@
           >执行</el-button
         >
       </template>
+
+      <template v-if="form.executeMethod == '3'">
+        <el-button
+          type="primary"
+          @click="save"
+          :loading="butLoading"
+          :disabled="form.executeStatus != 0"
+          >保存</el-button
+        >
+        <el-button type="primary" @click="submit" :loading="butLoading"
+          >执行</el-button
+        >
+      </template>
       <el-button @click="handleClose" :loading="butLoading">取 消</el-button>
     </template>
 
@@ -455,6 +457,7 @@
         ruleName: '',
         // 任务id
         taskId: null,
+        itemTaskName: '',
         // mes生产工单表工单号 code
         workOrderCode: '',
         // workOrderId mes生产工单表id

src/views/batchRecord/components/list.vue

@@ -258,7 +258,7 @@
             columnKey: 'action',
             slot: 'action',
             showOverflowTooltip: true,
-            minWidth: 120,
+            minWidth: 150,
             align: 'center',
             fixed: 'right'
           }

src/views/batchRecord/index.vue

@@ -42,6 +42,7 @@
                         placeholder="选择日期"
                         format="yyyy-MM-dd HH:mm:ss"
                         value-format="yyyy-MM-dd HH:mm:ss"
+                        @change="createTimeEndDateChange"
                       >
                       </el-date-picker>
                     </div>
@@ -314,6 +315,17 @@
       handleCurrentChange(pageNum) {
         this.productBody.pageNum = pageNum;
         this.getAllProductInWorkOrder();
+      },
+      createTimeEndDateChange() {
+        // 格式化 productBody.createTimeEnd 的时间为 23:59:59
+        if (this.productBody.createTimeEnd) {
+          const date = new Date(this.productBody.createTimeEnd);
+          date.setHours(23, 59, 59);
+          this.productBody.createTimeEnd = this.$util.toDateString(
+            date,
+            'yyyy-MM-dd HH:mm:ss'
+          );
+        }
       }
     }
   };

src/views/checklistManagement/components/templateAdd.vue

@@ -377,8 +377,7 @@
             align: 'center',
             resizable: false,
             fixed: 'right',
-            slot: 'action',
-            showOverflowTooltip: true
+            slot: 'action'
           }
         ];
       }
@@ -396,6 +395,9 @@
         } else if (type == 'edit') {
           this.title = '编辑放行单模版';
           this.getDetails(data.id);
+        } else if (type == 'detail') {
+          this.title = '放行单模版详情';
+          this.getDetails(data.id);
         } else {
           // 克隆
           this.title = '编辑放行单模版';

src/views/checklistManagement/templatelist.vue

@@ -35,6 +35,12 @@
             <el-link slot="reference" type="danger">删除</el-link>
           </el-popconfirm>
         </template>
+
+        <template v-slot:templateCode="{ row }">
+          <el-link type="text" @click="openAddDialog('detail', row)">{{
+            row.templateCode
+          }}</el-link>
+        </template>
       </ele-pro-table>
     </el-card>
 
@@ -76,10 +82,11 @@
           },
           {
             prop: 'templateCode',
-            label: '放行单编码',
+            label: '放行单模板编码',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'templateCode'
           },
           {
             prop: 'templateName',

vue.config.js

@@ -34,8 +34,9 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',
         // target: 'http://192.168.1.211:18086',