wukai пре 5 месеци
родитељ
комит
2ec61ef7c0
3 измењених фајлова са 126 додато и 108 уклоњено
  1. 8 0
      src/api/emp/empCalc.js
  2. 10 0
      src/views/emp/emp/index.vue
  3. 108 108
      src/views/emp/empCalc/index.vue

+ 8 - 0
src/api/emp/empCalc.js

@@ -42,3 +42,11 @@ export function delEmpCalc(calcId) {
         method: 'delete'
     })
 }
+
+//按日统计
+export function calc(empDate) {
+    return request({
+        url: '/emp/empCalc/calc?date=' + empDate,
+        method: 'get'
+    })
+}

+ 10 - 0
src/views/emp/emp/index.vue

@@ -71,6 +71,9 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
+          <el-button link type="primary" icon="Histogram" @click="handleCalc(scope.row)">
+            统计
+          </el-button>
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['emp:emp:edit']">
             修改
           </el-button>
@@ -173,6 +176,7 @@
 
 <script setup name="Emp">
 import {addEmp, delEmp, getEmp, listEmp, updateEmp} from "@/api/emp/emp";
+import {calc} from "@/api/emp/empCalc";
 
 const {proxy} = getCurrentInstance();
 
@@ -366,6 +370,12 @@ function handleDeleteTwinEmpDetailB() {
   }
 }
 
+function handleCalc(row) {
+  calc(row.empDate).then(response => {
+    proxy.$modal.msgSuccess("统计成功");
+  });
+}
+
 /** 复选框选中数据 */
 function handleTwinEmpDetailSelectionChange(selection) {
   checkedTwinEmpDetail.value = selection.map(item => item.index)

+ 108 - 108
src/views/emp/empCalc/index.vue

@@ -25,78 +25,78 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="机台号" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入机台号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="稼动率" prop="efficiency">
-        <el-input
-          v-model="queryParams.efficiency"
-          placeholder="请输入稼动率"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="米克重" prop="mick">
-        <el-input
-          v-model="queryParams.mick"
-          placeholder="请输入米克重"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="密度" prop="density">
-        <el-input
-          v-model="queryParams.density"
-          placeholder="请输入密度"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产量" prop="length">
-        <el-input
-          v-model="queryParams.length"
-          placeholder="请输入产量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="毛高" prop="height">
-        <el-input
-          v-model="queryParams.height"
-          placeholder="请输入毛高"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总价" prop="totalPrice">
-        <el-input
-          v-model="queryParams.totalPrice"
-          placeholder="请输入总价"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="机台号" prop="deviceId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.deviceId"-->
+<!--          placeholder="请输入机台号"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="稼动率" prop="efficiency">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.efficiency"-->
+<!--          placeholder="请输入稼动率"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="规格" prop="spec">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spec"-->
+<!--          placeholder="请输入规格"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="米克重" prop="mick">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.mick"-->
+<!--          placeholder="请输入米克重"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="密度" prop="density">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.density"-->
+<!--          placeholder="请输入密度"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产量" prop="length">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.length"-->
+<!--          placeholder="请输入产量"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="毛高" prop="height">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.height"-->
+<!--          placeholder="请输入毛高"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单价" prop="price">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.price"-->
+<!--          placeholder="请输入单价"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="总价" prop="totalPrice">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.totalPrice"-->
+<!--          placeholder="请输入总价"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -104,35 +104,35 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['emp:empCalc:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['emp:empCalc:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['emp:empCalc:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="Plus"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['emp:empCalc:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="Edit"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['emp:empCalc:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="Delete"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['emp:empCalc:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -164,14 +164,14 @@
       <el-table-column label="毛高" align="center" prop="height" />
       <el-table-column label="单价" align="center" prop="price" />
       <el-table-column label="总价" align="center" prop="totalPrice" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['emp:empCalc:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['emp:empCalc:remove']">删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['emp:empCalc:edit']">修改</el-button>-->
+<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['emp:empCalc:remove']">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"