aps预销售单配置页面

src/api/aps_workday_schedule/schedule.js

@@ -42,3 +42,6 @@ export function delSchedule(sequenceId) {
     method: 'delete'
   })
 }
+
+
+

src/views/aps/capacity/index.vue

@@ -3,12 +3,12 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="年份" prop="year">
         <el-select v-model="queryParams.year"  placeholder="请选择年份" clearable>
-                <el-option v-for="item in  dict.type.year_select" :key="item.value" :label="item.value" :value="item.value" ></el-option>
+                <el-option v-for="item in  year_select" :key="item.value" :label="item.value" :value="item.value" ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="月份" prop="month">
         <el-select v-model="queryParams.month"  placeholder="请选择月份" clearable>
-                  <el-option v-for="item in dict.type.month_select" :key="item.value" :label="item.value" :value="item.value" ></el-option>
+                  <el-option v-for="item in month_select" :key="item.value" :label="item.value" :value="item.value" ></el-option>
                 </el-select>
       </el-form-item>
 
@@ -26,7 +26,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['aps:capacity:add']"
+
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -37,7 +37,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['aps:capacity:edit']"
+
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -48,7 +48,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['aps:capacity:remove']"
+
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -58,10 +58,10 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['aps:capacity:export']"
-        >导出</el-button>
+          :disabled="single"
+        >详情</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
     </el-row>
 
     <el-table v-loading="loading" :data="capacityList" @selection-change="handleSelectionChange">
@@ -79,38 +79,33 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['aps:capacity:edit']"
+
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['aps:capacity:remove']"
+
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+
 
     <!-- 添加或修改工厂月产能定义对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="70%" :close-on-click-modal="false" modal-append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="年份" prop="year">
           <el-select v-model="form.year"  placeholder="请选择年份">
-                  <el-option v-for="item in  dict.type.year_select" :key="item.value" :label="item.value" :value="item.value" ></el-option>
+                  <el-option v-for="item in  year_select" :key="item.value" :label="item.value" :value="item.value" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="月份" prop="month">
           <el-select v-model="form.month"  placeholder="请选择月份">
-            <el-option v-for="item in dict.type.month_select" :key="item.value" :label="item.value" :value="item.value" ></el-option>
+            <el-option v-for="item in month_select" :key="item.value" :label="item.value" :value="item.value" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="规划产能(吨)" prop="plannedCapacity">
@@ -127,6 +122,19 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :title="titleDetail" :visible.sync="openDetail" width="75%" append-to-body>
+      <el-table v-loading="loading" :data="factory_capacity_detailList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" prop="id" />
+        <el-table-column label="年份" align="center" prop="year" />
+        <el-table-column label="月份" align="center" prop="month" />
+        <el-table-column label="日期" align="center" prop="day" />
+        <el-table-column label="规划产能(吨)" align="center" prop="plannedCapacity" />
+        <el-table-column label="已排产产能" align="center" prop="plannedSumCapacity" />
+        <el-table-column label="已排产单号" align="center" prop="plannedOrder" />
+        <el-table-column label="已排产产能" align="center" prop="plannedOrderCapacity" />
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -135,16 +143,28 @@ import { listSchedule, getSchedule, delSchedule, addSchedule, updateSchedule } f
 
 import { listCapacity, getCapacity, delCapacity, addCapacity, updateCapacity } from "@/api/aps/capacity";
 
+import { listFactory_capacity_detail, getFactory_capacity_detail, delFactory_capacity_detail, addFactory_capacity_detail, updateFactory_capacity_detail } from "@/api/aps/factory_capacity_detail";
+
 export default {
   name: "Capacity",
-  dicts: ['year_select','month_select'],
+  // dicts: ['year_select','month_select'],
   data() {
     return {
+      titleDetail:"工厂能力详情",
+      openDetail:false,
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
       scheduleList:[],
+      year_select:[
+        {"value":2025},{"value":2026},{"value":2027},{"value":2028}
+        ],
+      month_select:[
+        {"value":1},{"value":2},{"value":3},{"value":4},
+        {"value":5},{"value":6},{"value":7},{"value":8},
+        {"value":9},{"value":10},{"value":11},{"value":12},
+        ],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -155,6 +175,8 @@ export default {
       total: 0,
       // 工厂月产能定义表格数据
       capacityList: [],
+      // 工厂月产能定义详情表格数据
+      factory_capacity_detailList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -184,9 +206,9 @@ export default {
     getWorkDay() {
       this.loading = true;
       listSchedule({"year":this.form.year,"month":this.form.month}).then(response => {
-        this.scheduleList = response.rows;
+        this.scheduleList = response.data;
        if (this.scheduleList==null||this.scheduleList.length==0) {
-         this.$modal.msgSuccess("没有配置工作日");
+         this.$message.success("没有配置工作日");
          this.form.expandedCapacity = 0;
        }
        else this.form.expandedCapacity = this.scheduleList[0].workdayCount;
@@ -196,11 +218,19 @@ export default {
     getList() {
       this.loading = true;
       listCapacity(this.queryParams).then(response => {
-        this.capacityList = response.rows;
+        console.log(response)
+        this.capacityList = response.data;
         this.total = response.total;
         this.loading = false;
       });
     },
+    resetForm (){
+      this.form.year = null;
+      this.form.month = null;
+      this.form.plannedCapacity=  null;
+      this.form.expandedCapacity=null;
+      this.form.averageDailyCapacity=null;
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -245,7 +275,8 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getCapacity(id).then(response => {
-        this.form = response.data;
+
+        this.form = response.data.data;
         this.open = true;
         this.title = "修改工厂月产能定义";
       });
@@ -257,13 +288,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCapacity(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$message.success("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCapacity(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$message.success("新增成功");
               this.open = false;
               this.getList();
             });
@@ -274,19 +305,31 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除工厂月产能定义编号为"' + ids + '"的数据项？').then(function() {
+      this.$confirm('是否确认删除工厂月产能定义编号为"' + ids + '"的数据项？').then(function() {
         return delCapacity(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.$message.success("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('aps/capacity/export', {
-        ...this.queryParams
-      }, `capacity_${new Date().getTime()}.xlsx`)
-    }
+      this.openDetail = true;
+      this.getDetailList();
+      // this.download('aps/capacity/export', {
+      //   ...this.queryParams
+      // }, `capacity_${new Date().getTime()}.xlsx`)
+    },
+    /** 查询工厂月产能定义列表 */
+    getDetailList() {
+      const ids = this.ids;
+      this.loading = true;
+      listFactory_capacity_detail(this.queryParams).then(response => {
+        this.factory_capacity_detailList = response.data;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
   }
 };
 </script>