修改工厂

src/views/aps/capacity/index.vue

@@ -33,10 +33,10 @@
             :disabled="single">详情</el-button>
         </template>
         <template v-slot:plannedCapacity="{ row }">
-          {{ row.plannedCapacity }}{{row.plannedCapacityUnit?row.plannedCapacityUnit:''}}
+          {{ row.plannedCapacity }}{{ row.plannedCapacityUnit ? row.plannedCapacityUnit : '' }}
         </template>
         <template v-slot:averageDailyCapacity="{ row }">
-          {{ row.averageDailyCapacity }}{{row.plannedCapacityUnit?row.plannedCapacityUnit:''}}
+          {{ row.averageDailyCapacity }}{{ row.plannedCapacityUnit ? row.plannedCapacityUnit : '' }}
         </template>
         <template v-slot:action="{ row }">
           <el-link type="primary" :underline="false" icon="el-icon-edit" @click="handleUpdate(row)">
@@ -71,8 +71,19 @@
           </el-form-item>
           <el-form-item label="规划产能" prop="plannedCapacity">
             <div style="display: flex;align-items: center;justify-content: space-between;">
-              <el-input v-model="form.plannedCapacity" placeholder="请输入规划产能" style="width: calc(100% - 100px)" />
-              <DictSelection dictName="计量单位" v-model="form.plannedCapacityUnit" filterable clearable style="width: 100px;">
+              <el-input v-model="form.plannedCapacity" placeholder="请输入规划产能" style="width: calc(100% - 300px)" />
+
+              <el-select v-model="form.measureType" placeholder="计量类型">
+                <el-option v-for="item in measureTypeList" :key="item.value" :label="item.label"
+                  :value="item.value"></el-option>
+              </el-select>
+
+              <!-- <el-select v-model="form.plannedCapacityUnit" placeholder="计量单位">
+                <el-option v-for="item in month_select" :key="item.value" :label="item.value"
+                  :value="item.value"></el-option>
+              </el-select> -->
+              <DictSelection dictName="计量单位" v-model="form.plannedCapacityUnit" filterable clearable
+                style="width: 100px;">
               </DictSelection>
             </div>
           </el-form-item>
@@ -128,6 +139,16 @@ export default {
       year_select: [
         { "value": 2025 }, { "value": 2026 }, { "value": 2027 }, { "value": 2028 }
       ],
+      measureTypeList: [
+        {
+          label: '数量',
+          value: 1
+        },
+        {
+          label: '重量',
+          value: 2
+        },
+      ],
       month_select: [
         { "value": 1 }, { "value": 2 }, { "value": 3 }, { "value": 4 },
         { "value": 5 }, { "value": 6 }, { "value": 7 }, { "value": 8 },

src/views/aps/factory_capacity_detail/index.vue

@@ -113,6 +113,7 @@
 
     <!-- 添加或修改工厂月产能定义详情对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="年份" prop="year">
           <el-input v-model="form.year" placeholder="请输入年份" />
@@ -123,9 +124,11 @@
         <el-form-item label="日期" prop="day">
           <el-input v-model="form.day" placeholder="请输入日期" />
         </el-form-item>
+
         <el-form-item label="规划产能(吨)" prop="plannedCapacity">
           <el-input v-model="form.plannedCapacity" placeholder="请输入规划产能(吨)" />
         </el-form-item>
+        
         <el-form-item label="已排产产能" prop="plannedSumCapacity">
           <el-input v-model="form.plannedSumCapacity" placeholder="请输入已排产产能" />
         </el-form-item>
@@ -136,6 +139,7 @@
           <el-input v-model="form.plannedOrderCapacity" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>