From c205e0765ae18536a5b15b5ecbd5d3d0558b57fc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 一月 2024 17:29:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/equipment/mouldrecord/index.vue |  279 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 148 insertions(+), 131 deletions(-)

diff --git a/src/views/equipment/mouldrecord/index.vue b/src/views/equipment/mouldrecord/index.vue
index 0884c56..2a03676 100644
--- a/src/views/equipment/mouldrecord/index.vue
+++ b/src/views/equipment/mouldrecord/index.vue
@@ -1,19 +1,20 @@
 <template>
-    <div class="mod-config">
-        <basic-container>
-        <!-- <ttable
-        :table="table"
-        :isShowHide="true"
-        :ajaxFun="ajaxFun"
-        :prelang="prelang"
-        :options="options" 
-        ref="processconfiguration"
-        >
-        <template #toolbar></template>
-        </ttable> -->
-        <div>寮�鍙戜腑銆傘�傘��</div>
-        </basic-container>
-    </div>
+  <div class="mod-config">
+      <basic-container>
+      <ttable
+      :table="table"
+      :isShowHide="true"
+      :ajaxFun="ajaxFun"
+      :prelang="prelang"
+      :options="options" 
+      ref="processconfiguration"
+      >
+      <template #toolbar>
+
+      </template>
+      </ttable>
+      </basic-container>
+  </div>
 </template>
 
 <script>
@@ -21,121 +22,137 @@
 import { fetchList, } from '@/api/quality/finishedDelivery'
 
 export default {
-    data(){
-        return {
-            ajaxFun: fetchList,
-            prelang: 'operation',
-            dataListLoading: false,
-            options: {
-                height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
-                stripe: true, // 鏄惁涓烘枒椹汗 table
-                highlightCurrentRow: false, // 鏄惁瑕侀珮浜綋鍓嶈
-                border: true, // 鏄惁鏈夌旱鍚戣竟妗�
-                lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
-                fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
-                multiSelect: true, //
-                seqNo: true,
-                isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
-                isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
-                isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
-                defaultOrderBy: { column: 'createTime', direction: 'desc' }
-            },
-            table: {
-                total: 0,
-                currentPage: 1,
-                pageSize: 20,
-                data: [],
-                // 鏍囬
-                column: [
-                  {
-                    minWidth: '140',
-                    prop: 'packageNo',
-                    label: '鍖呰缂栧彿',
-                    isTrue: true,
-                    isSearch: true,
-                    searchInfoType: 'text',
-                  },{
-                    minWidth: '140',
-                    prop: 'outBatchNo',
-                    label: '鎵规鍙�',
-                    isTrue: true,
-                    isSearch: true,
-                    searchInfoType: 'text',
-                  },
-                  {
-                    minWidth: '140',
-                    prop: 'partNo',
-                    label: '浜у搧缂栧彿',
-                    isTrue: true,
-                    isSearch: true,
-                    searchInfoType: 'text',
-                  },
-                  {
-                    minWidth: '140',
-                    prop: 'partName',
-                    label: '浜у搧鍚嶇О',
-                    isTrue: true,
-                    isSearch: true,
-                    searchInfoType: 'text',
-                  },
-                  {
-                    minWidth: '140',
-                    prop: 'specs',
-                    label: '瑙勬牸鍨嬪彿',
-                    isTrue: true,
-                    isSearch: true,
-                    searchInfoType: 'text',
-                  },
-                  {
-                    minWidth: '140',
-                    prop: 'unit',
-                    label: '鍗曚綅',
-                    isTrue: true,
-                    isSearch: true,
-                    searchInfoType: 'text',
-                  },
-                  {
-                    minWidth: '140',
-                    prop: 'number',
-                    label: '鏁伴噺',
-                    isTrue: true,
-                    isSearch: true,
-                    searchInfoType: 'text',
-                  },
-                  {
-                    minWidth: '130',
-                    prop: 'createTime',
-                    label: '鍏ュ簱鏃堕棿',
-                    sort: true,
-                    isTrue: true,
-                    isSearch: true,
-                    searchInfoType: 'datetimerange',
-                    formatter: this.formatDateTime,
-                  },
-                  {
-                    minWidth: '130',
-                    prop: 'createUser',
-                    label: '鍒涘缓浜�',
-                    sort: true,
-                    isTrue: true,
-                    isSearch: true,
-                    searchInfoType: 'text',
-                  },
-                ],
-                toolbar: [],
-                // operator: [],
-                // operatorConfig: {}
-            },
-       }
+  data(){
+      return {
+          ajaxFun: fetchList,
+          prelang: 'operation',
+          dataListLoading: false,
+          options: {
+              height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
+              stripe: true, // 鏄惁涓烘枒椹汗 table
+              highlightCurrentRow: false, // 鏄惁瑕侀珮浜綋鍓嶈
+              border: true, // 鏄惁鏈夌旱鍚戣竟妗�
+              lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
+              fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
+              multiSelect: true, //
+              seqNo: true,
+              isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
+              isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
+              isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+              defaultOrderBy: { column: 'createTime', direction: 'desc' }
+          },
+          table: {
+              total: 0,
+              currentPage: 1,
+              pageSize: 20,
+              data: [],
+              // 鏍囬
+              column: [
+                {
+                  minWidth: '140',
+                  prop: 'packageNo',
+                  label: '璁惧',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },{
+                  minWidth: '140',
+                  prop: 'outBatchNo',
+                  label: '妯″叿缂栧彿',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'partNo',
+                  label: '妯″叿鍚嶇О',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'partName',
+                  label: '宸ュ簭',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'specs',
+                  label: '宸ユ',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'unit',
+                  label: '鎵瑰彿',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'number',
+                  label: '浜ч噺',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'number',
+                  label: '瀵垮懡杞崲绯绘暟',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'number',
+                  label: '浣跨敤閲�',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'number',
+                  label: '鎶ュ伐鍗曞彿',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '130',
+                  prop: 'createUser',
+                  label: '鐘舵��',
+                  sort: true,
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+              ],
+              toolbar: [],
+              // operator: [],
+              // operatorConfig: {}
+          },
+     }
+  },
+  // computed: {
+  //   ...mapGetters(['permissions'])
+  // },
+  components: {
+    ttable
+  },
+  medthods: {
+    formatDateTime(row, column, cellValue) {
+        return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
     },
-
-    components: {
-      ttable
-    },
-    medthods: {
-      formatDateTime(row, column, cellValue) {
-          return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
-      },
-    },
+  },
 }
-</script>
+</script>
\ No newline at end of file

--
Gitblit v1.9.3