Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/assignForm.vue

@@ -64,7 +64,12 @@
                     </el-form-item>
                   </template>
                 </el-table-column> -->
-                <el-table-column label="本次报工工时" align="center" prop="workTime" min-width="210">
+                <el-table-column
+                  label="本次报工工时"
+                  align="center"
+                  prop="workTime"
+                  min-width="210"
+                >
                   <template #header> <span style="color: red">*</span>本次报工工时 </template>
                   <template #default="{ row, $index }">
                     <el-form-item
@@ -273,6 +278,21 @@ const submitForms = async (val) => {
     message.warning(t('至少有一条报工'))
     return
   }
+
+  const totalAmount = ref(0)
+  const amountbool = ref(true)
+
+  if (list.value.length > 0 && formData.value.overTask == 0) {
+    list.value.forEach((item) => {
+      totalAmount.value += item.amount
+    })
+    amountbool.value = totalAmount.value < formData.value.amount + 0.01
+  }
+
+  if (!amountbool.value && formData.value.overTask == 0) {
+    message.warning(t('该车间不允许超额报工！'))
+    return
+  }
   formLoading.value = true
   try {
     list.value.forEach((item) => {

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue

@@ -144,7 +144,7 @@
         </el-row>
       </el-card>
       <!--  物料信息   -->
-      <el-card class="hl-card-info">
+      <el-card class="hl-card-info" :style="{ display: activetype == 'create' ? 'none' : '' }">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">物料信息</span>
         </template>
@@ -268,7 +268,7 @@
         </el-row>
       </el-card>
       <!--  附件信息   -->
-      <el-card class="hl-card-info">
+      <el-card class="hl-card-info" :style="{ display: activetype == 'create' ? 'none' : '' }">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">附件信息</span>
         </template>

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue

@@ -188,7 +188,8 @@
                 <el-button
                   style="margin-left: 10px !important"
                   class="hl-addbutton"
-                  type="primary"
+                  type="success"
+                  plain
                   size="large"
                   v-bind:disabled="activetype == 'review' || activetype == 'Check'"
                   @click="processBom"

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue

@@ -21,10 +21,10 @@
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="派工单号" prop="headerNo">
+        <el-form-item label="生产订单号" prop="projectOrderCode">
           <el-input
-            v-model="queryParams.headerNo"
+            v-model="queryParams.projectOrderCode"
-            placeholder="派工单号"
+            placeholder="生产订单号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
@@ -121,7 +121,7 @@
             <dict-tag :type="DICT_TYPE.BIZ_STORAGE_OUT_TYPE" :value="scope.row.stockInType" />
           </template>
         </el-table-column>
-        <el-table-column label="派工单号" align="center" prop="headerNo" min-width="180" />
+        <el-table-column label="生产订单号" align="center" prop="projectOrderCode" min-width="180" />
         <el-table-column label="出库仓库" align="center" prop="whId" min-width="140">
           <template #default="scope">
             {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
@@ -243,7 +243,8 @@ const queryParams = reactive({
   cancel: undefined,
   cancelTime: [],
   matNo: undefined,
-  matName: undefined
+  matName: undefined,
+  projectOrderCode:undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中