Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/privateComponents/components/DeploymentCardInfoSelect/index.vue

@@ -728,7 +728,9 @@ export default {
           this.form.inventory = resDeduplicate
           this.requestOp = resDeduplicate.map(item => {
             let disabled = false
-            if (item.qualityPeriod) {
+            // 用户的创建时间 < 当天时间  去掉校验
+            // 如果用户的创建时间是当天日期时间，需要校验保质期
+            if (item.qualityPeriod && (new Date().getTime() <= Date.parse(this.form.createTimeTo))) {
               disabled = new Date().getTime() > Date.parse(item.qualityPeriod)
             }
             if (this.subTypeName === 'AssignCardPaint') {

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

@@ -256,13 +256,13 @@ export default {
         type: 'warning'
         // customClass: 'lacclaims-footer-message'
       }).then(() => {
-        const params = {
-          id: row.id, // 记实id
-          operator: 'REMOVE'
-        }
+        // const params = {
+        //   id: row.id, // 记实id
+        //   operator: 'REMOVE'
+        // }
         // 发送请求
         // `ExtScanCodeRecord/removeScanCode?id=${row.extScanCodeRecords[0].id}&reqName=${row.extMaterial.resType2.typeName}`
-        post('/ExtScanCodeRecord/recursion', params)
+        post(`/ExtScanCodeRecord/removeScanCode?id=${row.id}`, {})
           .then((res) => {
             if (res.message.includes('成功')) {
               this.$parent.$parent.$parent.$refs.header.getTableData()