员工生产绩效添加机台号查询

src/views/calc/calcSpec/index.vue

@@ -9,78 +9,81 @@
           placeholder="请选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="小时;0-23" prop="hour">
-        <el-input
-          v-model="queryParams.hour"
-          placeholder="请输入小时;0-23"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备ID" prop="deviceId">
+<!--      <el-form-item label="小时" prop="hour">-->
+<!--        <el-input-number-->
+<!--            v-model="queryParams.hour"-->
+<!--            placeholder="请输入小时"-->
+<!--            clearable-->
+<!--            :min="0"-->
+<!--            :max="23"-->
+<!--            @change="handleQuery"-->
+<!--            style="width: 120px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="机台号" prop="deviceId">
         <el-input
           v-model="queryParams.deviceId"
-          placeholder="请输入设备ID"
-          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="spec">
-        <el-input
-          v-model="queryParams.spec"
-          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="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="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
+          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="spec">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spec"-->
+<!--          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="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="price">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.price"-->
+<!--          placeholder="请输入单价"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="备注" prop="remark">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.remark"-->
+<!--          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>
@@ -88,42 +91,41 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['calc:calcSpec:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['calc:calcSpec:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['calc:calcSpec:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="Plus"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['calc:calcSpec:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="Edit"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['calc:calcSpec:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="Delete"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['calc:calcSpec:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
           plain
           icon="Download"
           @click="handleExport"
-          v-hasPermi="['calc:calcSpec:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -131,29 +133,29 @@
 
     <el-table v-loading="loading" :data="calcSpecList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
+<!--      <el-table-column label="ID" align="center" prop="id" />-->
       <el-table-column label="日期" align="center" prop="dataDate" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.dataDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="小时;0-23" align="center" prop="hour" />
-      <el-table-column label="设备ID" align="center" prop="deviceId" />
+      <el-table-column label="小时" align="center" prop="hour" />
+      <el-table-column label="机台号" align="center" prop="deviceId" />
       <el-table-column label="织造米数" align="center" prop="length" />
       <el-table-column label="规格" align="center" prop="spec" />
       <el-table-column label="毛高" align="center" prop="height" />
       <el-table-column label="米克重" align="center" prop="mick" />
       <el-table-column label="密度" align="center" prop="density" />
-      <el-table-column label="单价" align="center" prop="price" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <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="['calc:calcSpec:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['calc:calcSpec:remove']">删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="单价" align="center" prop="price" />-->
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+<!--      <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="['calc:calcSpec:edit']">修改</el-button>-->
+<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['calc:calcSpec:remove']">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -176,8 +178,8 @@
         <el-form-item label="小时;0-23" prop="hour">
           <el-input v-model="form.hour" placeholder="请输入小时;0-23" />
         </el-form-item>
-        <el-form-item label="设备ID" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
+        <el-form-item label="机台号" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入机台号" />
         </el-form-item>
         <el-form-item label="织造米数" prop="length">
           <el-input v-model="form.length" placeholder="请输入织造米数" />

src/views/emp/empCalc/index.vue

@@ -25,14 +25,14 @@
           <el-option value="B" label="B班"></el-option>
         </el-select>
       </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="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"-->
@@ -304,6 +304,7 @@ const total = ref(0);
 const title = ref("");
 const dayTime = ref("")
 const monthTime = ref("")
+const defaultSort = ref({ prop: "deviceId", order: "ascending" })
 
 const data = reactive({
   form: {},
@@ -322,8 +323,6 @@ const data = reactive({
     height: null,
     price: null,
     totalPrice: null,
-    orderByColumn: 'calcId',
-    isAsc: 'descending'
   },
   rules: {}
 });