From d8531973c376e44b27567dd9b35200a6d42e4c61 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 29 十一月 2023 10:44:48 +0800
Subject: [PATCH] 	modified:   src/views/quality/package/index.vue 	modified:   src/views/warehouse/pallettransports/index.vue

---
 src/views/quality/package/index.vue            |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/views/warehouse/pallettransports/index.vue |    2 
 2 files changed, 166 insertions(+), 8 deletions(-)

diff --git a/src/views/quality/package/index.vue b/src/views/quality/package/index.vue
index 99aee6a..ba390b6 100644
--- a/src/views/quality/package/index.vue
+++ b/src/views/quality/package/index.vue
@@ -1,13 +1,171 @@
 <template>
-  <div>鍖呰妫�楠�</div>
+  <div class="mod-config">
+      <basic-container>
+      <ttable
+      :table="table"
+      :isShowHide="true"
+      :prelang="prelang"
+      :options="options" 
+      ref="processconfiguration"
+      >
+      <template #toolbar></template>
+      </ttable>
+      </basic-container>
+  </div>
 </template>
 
 <script>
+import ttable from '@/views/common/ztt-table.vue'
 export default {
-
+  data(){
+      return {
+          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: 'material',
+                  label: '璁㈠崟缂栫爜',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'type',
+                  label: '浜у搧鍚嶇О',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },{
+                  minWidth: '140',
+                  prop: 'oo',
+                  label: '浜у搧鍨嬪彿',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },{
+                  minWidth: '140',
+                  prop: 'materhhooial',
+                  label: '璐ㄩ噺杩芥函鍙�',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'mateuurial',
+                  label: '瀹㈡埛鍚嶇О',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'materoiial',
+                  label: '宸ヨ壓鏂囦欢缂栧彿',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'matperoial',
+                  label: '搴撲綅鍙�',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '140',
+                  prop: 'materpial',
+                  label: '浜у搧鍚嶇О',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+                {
+                  minWidth: '130',
+                  width: '150',
+                  prop: 'dealTime',
+                  label: '瀹℃牳鏃堕棿',
+                  sort: true,
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'datetimerange',
+                  // formatter: this.formatDateTime,
+              },
+              {
+                  minWidth: '140',
+                  prop: 'maial',
+                  label: '鏁伴噺',
+                  isTrue: true,
+                  isSearch: true,
+                  searchInfoType: 'text',
+                },
+              ],
+              operator: [{
+                        text: '鎵撳嵃',
+                        type: 'text',
+                        size: 'small',
+                        fun: this.showPrint,
+                        show: {
+                            val: [
+                                '1',
+                                '0'
+                            ],
+                            key: 'result'
+                        }
+                    },{
+                        text: '浣滃簾',
+                        type: 'text',
+                        size: 'small',
+                        fun: this.deleteHandle
+                    }],
+                    operatorConfig: {
+                    fixed: 'right',
+                    label: '鎿嶄綔',
+                    width: 100,
+                    minWidth: 100
+                    },
+              toolbar: [
+                {
+                  text: '鑾峰彇IFS鎴愬搧搴�',
+                  type: 'primary',
+                  // fun: this.addOrUpdateHandle
+                },
+              ],
+              // operator: [],
+              // operatorConfig: {}
+          },
+     }
+  },
+  medthods: {},
+//     computed: {
+//     ...mapGetters(['permissions'])
+//   },
+  components: {
+  ttable
+  },
 }
-</script>
-
-<style>
-
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 9a4dda2..9b26943 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -710,7 +710,7 @@
       this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
       let pId = ids[ids.length - 1];
       console.log(pId);
-      if(pId!=null){
+      if(pId){
         selectAll({
             transportsId:this.currPalletTransportsRow.id,
             transportsMaterialId: pId

--
Gitblit v1.9.3