Sfoglia il codice sorgente

物资信息管理样式修改

zhangyihao 7 mesi fa
parent
commit
65a5b3b2a6

+ 7 - 0
src/types/components.d.ts

@@ -36,6 +36,8 @@ declare module 'vue' {
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -53,9 +55,12 @@ declare module 'vue' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -64,6 +69,8 @@ declare module 'vue' {
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']

+ 5 - 2
src/views/comprehensiveGuarantee/MaterialReserveManagement/addMaterialInformation.vue

@@ -33,7 +33,10 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态:" prop="status">
-                <el-input v-model="form.status" placeholder="请输入状态" />
+                <el-select v-model="form.status" placeholder="请选择状态">
+                  <el-option label="启用" value="启用"></el-option>
+                  <el-option label="禁用" value="禁用"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -313,7 +316,7 @@ const data = reactive({
     inventory_warning_pusher: [{ required: true, message: '库存预警推送人不能为空', trigger: 'blur' }],
     origin: [{ required: true, message: '产地不能为空', trigger: 'blur' }],
     from_sys: [{ required: true, message: '来源系统不能为空', trigger: 'blur' }],
-    status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+    status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
     room_id: [{ required: true, message: '库房不能为空', trigger: 'blur' }],
     package_quantity: [{ required: true, message: '包装数量不能为空', trigger: 'blur' }],
     package_volume: [{ required: true, message: '包装体积不能为空', trigger: 'blur' }],

+ 3 - 8
src/views/comprehensiveGuarantee/materialReserves/materialsDistributionAdd.vue

@@ -44,13 +44,6 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="调度目的" prop="dispatch_purpose" align="center">
-              <template #default="scope">
-                <el-form-item :prop="'detail.' + scope.$index + '.dispatch_purpose'" :rules="rules.dispatch_purpose">
-                  <el-input v-model="scope.row.dispatch_purpose" type="textarea" autosize placeholder="请输入" />
-                </el-form-item>
-              </template>
-            </el-table-column>
           </el-table>
         </el-form>
         <div class="common-dialog-footer" style="margin-top: 18px">
@@ -83,7 +76,7 @@ const props = defineProps({
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const emits = defineEmits(['close']);
-
+let dispatch_purpose = ref('');
 const formRef = ref();
 let detailData = reactive({
   dispatch_purpose: '',
@@ -120,9 +113,11 @@ const submitForm = async (formEl) => {
   if (!formEl) return;
   await formEl.validate((valid) => {
     if (valid) {
+      detailData.dispatch_purpose = dispatch_purpose.value;
       createDispatch(detailData).then(() => {
         proxy.$modal.msgSuccess('新增成功');
         emits('close', true);
+        emits('refresh');
       });
     } else {
       nextTick(() => {