物料领用发放增加关闭按钮；操作工界面增加代用标识

applications/dee-mes/src/views/taskExecution/components/ConfirmMaterial/footer.vue

@@ -68,7 +68,23 @@
           sortable
           show-overflow-tooltip
         />
-        <el-table-column v-if="flag" :width="80" label="操作" align="center">
+        <el-table-column
+          v-if="flag"
+          prop="isClosure"
+          label="是否关闭"
+          align="center"
+          :min-width="100"
+          sortable
+          show-overflow-tooltip
+          :formatter="(row, column, cellValue, index)=>{
+            if(cellValue){
+              return '是'
+            }else{
+              return '否'
+            }
+          }"
+        />
+        <el-table-column v-if="flag" :width="200" label="操作" align="center">
           <template slot-scope="scope">
             <el-button
               :disabled="scope.row.scanCodeRecordsState==='未确认'"
@@ -76,6 +92,12 @@
               type="danger"
               @click="deleteRow(scope.row)"
             >删除</el-button>
+            <el-button
+              :disabled="scope.row.scanCodeRecordsState==='已确认'||scope.row.isClosure"
+              size="mini"
+              type="info"
+              @click="closeData(scope.row)"
+            >关闭</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -418,6 +440,39 @@ export default {
             this.$parent.$parent.$parent.$refs.header.init()
           })
       })
+    },
+    closeData(row) {
+      this.$confirm('你是否确定关闭当前数据项?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const params = {
+          'id': row.id,
+          'operator': 'MODIFY',
+          'isClosure': true
+        }
+        post(`/ExtSupportingItem/recursion`, params)
+          .then((res) => {
+            if (res.message.includes('成功')) {
+              this.init()
+              this.$message({
+                type: 'success',
+                message: '关闭成功!'
+              })
+            } else {
+              this.$message({
+                type: 'error',
+                message: '关闭失败!'
+              })
+            }
+          })
+          .catch((err) => console.error(err))
+          .finally(() => {
+            this.loading = false
+            this.$parent.$parent.$parent.$refs.header.init()
+          })
+      })
     }
   }
 }

applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue

@@ -74,6 +74,9 @@
                   <div v-show="item.status === 'Paused'">
                     <span>暂停</span>
                   </div>
+                  <div v-show="item.isDaiLio">
+                    <span>代用</span>
+                  </div>
                 </div>
               </div>
               <div class="bottom-content">