ソースを参照

添加搜索。

jiaxiaoqiang 6 ヶ月 前
コミット
08643a377e

+ 4 - 3
src/views/device/metering/index.vue

@@ -86,7 +86,7 @@
       width="850px"
       @close="dialog.visible = false"
     >
-      <device-page @deviceInfo="deviceInfo" />
+      <device-page @device-info="deviceInfo" />
     </el-dialog>
 
     <el-dialog
@@ -280,7 +280,7 @@
       height="80%"
       @close="dialog2.visible = false"
     >
-      <record-page :maintenanceId="maintenanceInfo.id"></record-page>
+      <record-page :maintenanceId="maintenanceInfo.id" />
     </el-dialog>
   </div>
 </template>
@@ -491,6 +491,7 @@ option.value = Object.assign(option.value, {
     {
       label: "出厂编号",
       prop: "serialNumber",
+      search: true,
       overHidden: true,
     },
 
@@ -796,7 +797,7 @@ const column2 = ref([
 
 onMounted(() => {
   search.value.needMetering = "1";
-  maintenanceInfo.result = "0";
+  maintenanceInfo.value.result = "0";
   dataList();
   //queryUserList()
   queryUnitList();

+ 5 - 2
src/views/plan/track/index.vue

@@ -15,8 +15,7 @@
       @size-change="dataList"
       @current-change="dataList"
       @selection-change="selectionChange"
-    >
-    </avue-crud>
+    />
   </div>
 </template>
 <script setup>
@@ -109,6 +108,7 @@ option.value = Object.assign(option.value, {
     {
       label: "产线名称",
       prop: "productLineName",
+      search: true,
       editDisabled: true,
     },
     {
@@ -132,15 +132,18 @@ option.value = Object.assign(option.value, {
       label: "物料规格",
       prop: "materialModel",
       editDisabled: true,
+      search: true,
     },
     {
       label: "当前工序编码",
       prop: "operationCode",
+      search: true,
       editDisabled: true,
     },
     {
       label: "当前工序名称",
       prop: "operationName",
+      search: true,
       editDisabled: true,
     },
     {

+ 2 - 2
src/views/report/statistics/dailystorage/index.vue

@@ -195,12 +195,12 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "产品编码",
       prop: "materialCode",
-      search: false,
+      search: true,
     },
     {
       label: "产品名称",
       prop: "materialName",
-      search: false,
+      search: true,
     },
     {
       label: "产品规格",

+ 3 - 3
src/views/report/statistics/outputstatistics/index.vue

@@ -154,12 +154,12 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "物料名称",
       prop: "materialName",
-      search: false,
+      search: true,
     },
     {
       label: "物料规格",
       prop: "materialModel",
-      search: false,
+      search: true,
     },
     {
       label: "工序编码",
@@ -169,7 +169,7 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "工序名称",
       prop: "operationName",
-      search: false,
+      search: true,
     },
     {
       label: "工位",

+ 3 - 3
src/views/report/statistics/processanomaly/index.vue

@@ -201,17 +201,17 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "物料名称",
       prop: "materialName",
-      search: false,
+      search: true,
     },
     {
       label: "物料规格",
       prop: "materialModel",
-      search: false,
+      search: true,
     },
     {
       label: "工序编码",
       prop: "operationCode",
-      search: false,
+      search: true,
     },
     {
       label: "工序名称",

+ 3 - 3
src/views/report/statistics/stationbeat/index.vue

@@ -117,7 +117,7 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "订单名称",
       prop: "orderName",
-      search: false,
+      search: true,
     },
     {
       label: "工单编码",
@@ -137,12 +137,12 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "物料名称",
       prop: "materialName",
-      search: false,
+      search: true,
     },
     {
       label: "物料规格",
       prop: "materialModel",
-      search: false,
+      search: true,
     },
     {
       label: "标准用时(秒)",

+ 3 - 3
src/views/report/statistics/workeveryday/index.vue

@@ -294,12 +294,12 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "物料编码",
       prop: "materialCode",
-      search: false,
+      search: true,
     },
     {
       label: "物料名称",
       prop: "materialName",
-      search: false,
+      search: true,
     },
     {
       label: "物料规格",
@@ -314,7 +314,7 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "工序名称",
       prop: "operationName",
-      search: false,
+      search: true,
     },
     {
       label: "总完工数量",

+ 3 - 3
src/views/report/workhourinfo/prodthours/index.vue

@@ -117,12 +117,12 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "订单名称",
       prop: "orderName",
-      search: false,
+      search: true,
     },
     {
       label: "工单编码",
       prop: "workOrderCode",
-      search: false,
+      search: true,
     },
     {
       label: "物料编码",
@@ -137,7 +137,7 @@ data1.value.option = Object.assign(data1.value.option, {
     {
       label: "规格",
       prop: "spec",
-      search: false,
+      search: true,
     },
     {
       label: "完成数量",

+ 61 - 59
src/views/storage/stock/index.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="mainContentBox">
     <avue-crud
-        ref="crudRef"
-        v-model:search="search"
-        v-model="form"
-        :data="data"
-        :option="option"
-        v-model:page="page"
-        @row-save="createRow"
-        @row-update="updateRow"
-        @row-del="deleteRow"
-        @search-change="searchChange"
-        @search-reset="resetChange"
-        @size-change="dataList"
-        @current-change="dataList"
-        :row-style="rowStyle"
-        :cell-style="cellStyle"
-        @selection-change="selectionChange"
+      ref="crudRef"
+      v-model:search="search"
+      v-model="form"
+      :data="data"
+      :option="option"
+      v-model:page="page"
+      @row-save="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      :row-style="rowStyle"
+      :cell-style="cellStyle"
+      @selection-change="selectionChange"
     >
       <template #menu-left="{ size }">
         <el-button
@@ -30,12 +30,12 @@
       </template>
     </avue-crud>
     <el-dialog
-        v-model="dialog1.visible"
-        :title="dialog1.title"
-        width="950px"
-        @close="dialog1.visible = false"
+      v-model="dialog1.visible"
+      :title="dialog1.title"
+      width="950px"
+      @close="dialog1.visible = false"
     >
-      <choice-item-page @materialInfo="materialInfo"/>
+      <choice-item-page @material-info="materialInfo" />
     </el-dialog>
     <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
   </div>
@@ -58,7 +58,8 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/wms/stock",
   });
-const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
 
@@ -68,12 +69,12 @@ const dialog1 = reactive({
   visible: false,
 });
 const materialInfo = (value) => {
-  form.value.materialNo = value.materialCode
-  form.value.materialName = value.materialName
-  form.value.materialModel = value.spec
-  form.value.unit = value.unitDictValue
-  dialog1.visible = false
-}
+  form.value.materialNo = value.materialCode;
+  form.value.materialName = value.materialName;
+  form.value.materialModel = value.spec;
+  form.value.unit = value.unitDictValue;
+  dialog1.visible = false;
+};
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   delBtn: false,
@@ -133,8 +134,7 @@ option.value = Object.assign(option.value, {
       search: true,
       width: 90,
       overHidden: true,
-      dicUrl:
-          dictDataUtil.request_url +"stock_material_type",
+      dicUrl: dictDataUtil.request_url + "stock_material_type",
       props: {
         label: "dictLabel",
         value: "dictValue",
@@ -151,6 +151,7 @@ option.value = Object.assign(option.value, {
       label: "料箱编号",
       prop: "vehicleCode",
       editDisabled: true,
+      search: true,
       rules: [
         {
           required: true,
@@ -176,7 +177,7 @@ option.value = Object.assign(option.value, {
       width: 120,
       overHidden: true,
       prop: "batchCode",
-      search: true
+      search: true,
     },
     /*{
       label: "流转卡号",
@@ -189,9 +190,10 @@ option.value = Object.assign(option.value, {
       prop: "materialName",
       width: 130,
       overHidden: true,
+      search: true,
       click: ({ value, column }) => {
-        if(column.boxType){
-          dialog1.visible = true
+        if (column.boxType) {
+          dialog1.visible = true;
         }
       },
       /*rules: [
@@ -205,18 +207,18 @@ option.value = Object.assign(option.value, {
     {
       label: "数量",
       prop: "num",
-      type: 'number',
+      type: "number",
       min: 0,
       max: 99999,
       width: 150,
       overHidden: true,
-      formatter:(val,value,label)=>{
-        if(val.warningMsg){
-          return val.num+"("+val.warningMsg+")"
-        }else{
-          return val.num
+      formatter: (val, value, label) => {
+        if (val.warningMsg) {
+          return val.num + "(" + val.warningMsg + ")";
+        } else {
+          return val.num;
         }
-      }
+      },
     },
     {
       label: "单位",
@@ -224,31 +226,31 @@ option.value = Object.assign(option.value, {
     },
   ],
 });
-const rowStyle = ({row,column,rowIndex}) =>{
-  if(row.warningMsg){
+const rowStyle = ({ row, column, rowIndex }) => {
+  if (row.warningMsg) {
     return {
-      backgroundColor:'#f3d2d2',
-      color:'#6c6a6a'
-    }
+      backgroundColor: "#f3d2d2",
+      color: "#6c6a6a",
+    };
   }
-}
-const cellStyle = ({row,column,rowIndex,columnIndex})=>{
-  if(columnIndex === 10){
-    if(row.warningMsg){
+};
+const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
+  if (columnIndex === 10) {
+    if (row.warningMsg) {
       return {
-        color:'red',
-        fontWeight:'bold',
-        fontSize:'20'
-      }
-    }else{
+        color: "red",
+        fontWeight: "bold",
+        fontSize: "20",
+      };
+    } else {
       return {
-        color: '#60fc56',
-        fontWeight:'bold',
-        fontSize:'20'
-      }
+        color: "#60fc56",
+        fontWeight: "bold",
+        fontSize: "20",
+      };
     }
   }
-}
+};
 onMounted(() => {
   // console.log("crudRef", crudRef)
   dataList();