回退 编辑页

mes-ui/mes-ui-admin-vue3/src/styles/cus.scss

@@ -17,8 +17,7 @@
 }
 
 .hl-card {
-  position: relative;
-  padding-bottom: 100px;
+  margin: 0px;
   border-radius: 10px !important;
   .el-card__header {
     background-color: #f7f8fa;
@@ -35,23 +34,6 @@
       font-size: 20px !important;
     }
   }
-
-  .hl-card-scrollable-content {
-    width: 100%;
-    box-sizing: border-box;
-    max-height: calc(100vh - 300px); overflow-y: auto;
-  }
-  .hl-footer {
-    width: 96%;
-    background-color: #fff;
-    position: absolute !important;
-    left: 50%;
-    height: 100px;
-    line-height: 100px;
-    transform: translateX(-51%);
-    bottom: 0px;
-    z-index: 1000;
-  }
 }
 .borderxx {
   border: none !important;
@@ -106,7 +88,7 @@
   border: none !important;
 
   .el-card__header {
-    padding-bottom: 16px ;
+    padding: 16px 0px;
     background-color: inherit;
 
     .hl-card-info-icona {
@@ -124,13 +106,14 @@
 
   .el-card__body {
     padding: 15px 0px;
+
     .el-row {
       margin: 10px;
     }
   }
 }
 .hl-incard {
-  margin-bottom: 10px;
+  margin-bottom: 20px;
   padding: 0 20px;
 }
 
@@ -138,6 +121,9 @@
   margin: 10px 0px 10px 0px !important;
 }
 
+.hl-footer {
+  margin: 30px 0;
+}
 .abstatus {
   position: absolute;
   right: 80px;
@@ -159,6 +145,7 @@
   }
 }
 
+
 /* ---el-table滚动条公共样式--- */
 .el-scrollbar {
   // 横向滚动条

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

@@ -4,7 +4,6 @@
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
-    <div class="hl-card-scrollable-content" >
     <el-form
       ref="formRef"
       :model="formData"
@@ -421,7 +420,6 @@
         </el-row>
       </el-card>
     </el-form>
-    </div>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
       <el-button
@@ -519,6 +517,7 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
+
   // 校验表单
   await formRef.value.validate()
   if(formData.value.matItemDOList.length === 0){
@@ -580,6 +579,7 @@ const handleStatus = async (num) => {
   query.type= 'update'
   query.id = formData.value.id
   reload()
+
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
@@ -671,6 +671,7 @@ const saveFormData = async () => {
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
+
   } finally {
     formLoading.value = false
   }
@@ -696,7 +697,7 @@ const submitForm = async () => {
   query.id = storageid.value
   formData.value.id = storageid.value
   //页面重新加载
-  reload()
+  reload();
 }
 
 var matCount = 1
@@ -865,6 +866,7 @@ onMounted(async () => {
       isShowBtnDelete.value = false
     }
 
+
     //获得库区列表
     const queryParamsRg = reactive({
       pageNo: 1,
@@ -928,14 +930,10 @@ onMounted(async () => {
   //用户信息
   userList.value = await UserApi.getSimpleUserList()
 })
-
-
 </script>
-<style setup lang="scss">
+<style>
 a {
   color: #409eff;
   text-decoration: none;
 }
-
-
 </style>

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

@@ -4,7 +4,6 @@
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
-    <div class="hl-card-scrollable-content">
     <el-form
       ref="formRef"
       :model="formData"
@@ -168,12 +167,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="matCode"
-                      label="物料编码"
-                      min-width="120"
-                      align="center"
-                    />
+                  <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
                   <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
                     <template #default="scope">
                       <dict-tag
@@ -183,12 +177,7 @@
                       />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="matSpec"
-                      label="规格/型号"
-                      min-width="120"
-                      align="center"
-                    />
+                  <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
 
                   <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
                     <template #default="scope">
@@ -243,12 +232,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="matRest"
-                      label="库存数量"
-                      min-width="120"
-                      align="center"
-                    />
+                  <el-table-column prop="matRest" label="库存数量" min-width="120" align="center" />
                   <el-table-column prop="storageOkQty" min-width="120" align="center">
                     <template #header> <span class="hl-table_header">*</span>出库数量</template>
                     <template #default="scope">
@@ -408,7 +392,6 @@
         </el-row>
       </el-card>
     </el-form>
-    </div>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
       <el-button
@@ -506,6 +489,7 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '出库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
+
   // 校验表单
   await formRef.value.validate()
   if(formData.value.matItemDOList.length === 0){
@@ -676,6 +660,9 @@ const saveFormData = async () => {
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
+
+    
+   
   } finally {
     formLoading.value = false
   }
@@ -725,6 +712,7 @@ const onAddItem = () => {
     }
     matCount = matCount + 1
 
+
     formData.value.matItemDOList.push(newData)
   } else {
     message.alertWarning('请选择出库仓库')
@@ -760,14 +748,11 @@ const handleWh = async (wid) => {
   let matParams = {
     pageNo: 1,
     pageSize: 99,
-    status: '1'
+    status: "1"
   }
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter(
-    (item) =>
-      matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined
-  )
+  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined)
 
   formData.value.matItemDOList = []
   // formData.value.matItemDOList.forEach(item => {
@@ -807,12 +792,7 @@ const remoteMatCodeSearch = async (name) => {
 
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter(
-    (item) =>
-      matLastRemoteData.find(
-        (fish) => fish.matId === item.id && fish.whId == formData.value.whId
-      ) !== undefined
-  )
+  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == formData.value.whId) !== undefined)
   matSelectLoading.value = false
 }
 
@@ -882,6 +862,8 @@ onMounted(async () => {
   dialogTitle.value = t('action.' + query.type)
   dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
 
+ 
+
   //-------------------仓库全数据
   const data = await WarehouseApi.getWarehouseSimpList()
   warehouseList.value = data