Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-heli into dev

mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue

@@ -1,44 +1,40 @@
 <template>
-  <ContentWrap>
+  <el-card class="hl-card">
+    <template #header>
+      <span>生产计划</span>
+    </template>
+    <ContentWrap class="borderxx">
       <!-- 搜索工作栏 -->
       <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="105px">
         <el-form-item label="项目编号" prop="projectCode">
-        <el-input v-model="queryParams.projectCode" placeholder="项目编号" clearable @keyup.enter="handleQuery"
-          class="!w-250px" />
+          <el-input v-model="queryParams.projectCode" placeholder="项目编号" clearable @keyup.enter="handleQuery" class="!w-250px" />
         </el-form-item>
         <el-form-item label="客户名称" prop="customerName">
-        <el-input v-model="queryParams.customerName" placeholder="客户名称" clearable @keyup.enter="handleQuery"
-          class="!w-250px" />
+          <el-input v-model="queryParams.customerName" placeholder="客户名称" clearable @keyup.enter="handleQuery" class="!w-250px" />
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-        <el-input v-model="queryParams.projectName" placeholder="项目名称" clearable @keyup.enter="handleQuery"
-          class="!w-250px" />
+          <el-input v-model="queryParams.projectName" placeholder="项目名称" clearable @keyup.enter="handleQuery" class="!w-250px" />
         </el-form-item>
         <el-form-item label="业务员" prop="businessManName">
-        <el-input v-model="queryParams.businessManName" placeholder="业务员" clearable @keyup.enter="handleQuery"
-          class="!w-250px" />
+          <el-input v-model="queryParams.businessManName" placeholder="业务员" clearable @keyup.enter="handleQuery" class="!w-250px" />
         </el-form-item>
         <el-form-item label="所属业务线" prop="businessLine">
           <el-select class="!w-250px" v-model="queryParams.businessLine" placeholder="下拉选择">
-          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BUSINESS_LINE)" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+            <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BUSINESS_LINE)" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="性质" prop="property">
           <el-select class="!w-250px" v-model="queryParams.property" placeholder="下拉选择">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PROPERTY)" :key="dict.value"
-            :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PROPERTY)" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="生产状态" prop="status">
           <el-select v-model="queryParams.status" placeholder="生产状态" clearable class="!w-250px">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict.value"
-            :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="项目负责人" prop="projectOwner">
-        <el-input v-model="queryParams.projectOwner" placeholder="项目负责人" clearable @keyup.enter="handleQuery"
-          class="!w-250px" />
+          <el-input v-model="queryParams.projectOwner" placeholder="项目负责人" clearable @keyup.enter="handleQuery" class="!w-250px" />
         </el-form-item>
         <el-form-item>
           <el-button @click="handleQuery">
@@ -56,7 +52,7 @@
 
     <!-- 列表 -->
     <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
         <el-table-column fixed label="计划单号" align="center" prop="planNo" width="150">
           <template #default="scope">
             <el-button text type="primary" @click="handleCommand('detail',scope.row.id)">
@@ -132,6 +128,8 @@
 
         <el-table-column fixed="right" label="操作" align="center" width="150">
           <template #default="scope">
+            <el-row>
+              <el-col>
                 <el-button link type="primary" @click="openForm(scope.row.id)">
                   编辑
                 </el-button>
@@ -150,14 +148,17 @@
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
+              </el-col>
+            </el-row>
+
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+      <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </ContentWrap>
 
+  </el-card>
   <!-- 【打印启动单】 - 弹框-->
   <Print ref="printRef" />
 </template>
@@ -189,7 +190,7 @@ const queryParams = reactive({
   businessLine: undefined,
   property: undefined,
   projectOwner: undefined,
-  status: undefined,
+  status: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -270,3 +271,12 @@ onMounted( async() => {
   await getList()
 })
 </script>
+<style scoped>
+.el-dropdown-link {
+  cursor: pointer;
+  margin: 5px;
+  color: var(--el-color-primary);
+  display: flex;
+  align-items: center;
+}
+</style>

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue

@@ -134,7 +134,6 @@
                   </el-table-column>
                   <el-table-column prop="matSub" label="盈亏差异" min-width="120" align="center">
                     <template #default="scope">
-
                       <div v-if="scope.row.matSub<0" style="color:#EC808D;">
                         {{scope.row.matSub}}
                       </div>
@@ -593,10 +592,12 @@ const handlePn = async (pnid, scope) => {
 }
 const handleSub = async (pNum, scope) => {
   //-------------------库位全数据
-  scope.row.matSub = Number(pNum) - Number(scope.row.matRest)
-  console.log(typeof scope.row.matSub)
+  // scope.row.matSub = Number(pNum) - Number(scope.row.matRest)
+  // console.log(typeof scope.row.matSub)
 
-  //-----------------
+  const matSubValue = Number(pNum) - Number(scope.row.matRest)
+  scope.row.matSub = matSubValue.toFixed(2) // 保留两位小数
+  console.log(typeof scope.row.matSub)
 }
 
 //仓库列表
@@ -700,10 +701,9 @@ onMounted(async () => {
   })
 
   formData.value.matItemDOList.sort((a, b) => a.matCode - b.matCode)
-  formData.value.matItemDOList.forEach(item=>{
+  formData.value.matItemDOList.forEach((item) => {
     item.cid = matCount
     matCount = matCount + 1
-
   })
   // 附件信息
   let attParams = {