Explorar el Código

修复盘点数据状态

liuyanpeng hace 3 años
padre
commit
b1bf2c99e0

+ 3 - 21
src/components/customer/CommonTable.vue

@@ -12,9 +12,7 @@
         :columns="columns"
         :scroll="{y:410}"
         :pagination="pagination"
-        :row-selection="isSelect ? rowSelection : null"
         :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)"
-        @resize-column="handleResizeColumn"
       >
         <template v-for="(item,index) in renderArr" #[item]="scope" :key="index">
           <slot :name="item" :scope="scope" v-bind="scope || {}" />
@@ -65,8 +63,8 @@ const pagination = reactive({
 const showSizeChange = (current, pageSize) => {
   setTimeout(() => {
     pagination.current = 1;
-    emit('getPage', pagination.current, pageSize);
-  },1000);
+    // emit('getPage', pagination.current, pageSize);
+  },500);
   pagination.pageSize = pageSize;
 };
 
@@ -76,23 +74,7 @@ const changePage = (current, size) => {
   emit('getPage', pagination.current, size);
 };
 
-// 是否多选
-const emit = defineEmits(['batch', 'getPage']);
-const rowSelection = {
-  onChange: (selectedRowKeys, selectedRows) => {
-    // console.log(selectedRowKeys, selectedRows);
-    // emit('batch', selectedRowKeys);
-  },
-  getCheckboxProps: record => ({
-    // disabled: record.name === '',
-    // name: record.name,
-  }),
-};
-
-// 表头可拖拽配置
-const handleResizeColumn = (w, col) => {
-  col.width = w;
-};
+const emit = defineEmits(['getPage']);
 
 // 监听total变化
 watch(

+ 8 - 8
src/components/customer/InventoryDataProcessingStep4.vue

@@ -20,8 +20,8 @@
           <span>
             {{
               record.processed === null || record.processed === false
-                ? "关闭"
-                : "打开"
+                ? "打开"
+                : "关闭"
             }}</span>
         </template>
         <template v-if="column.key === 'operation'">
@@ -33,10 +33,10 @@
             "
             @click="operate(record)"
           >
-            打开
+            关闭
           </a-button>
           <a-button v-if="record.processed === true" @click="operate(record)">
-            关闭
+            打开
           </a-button>
         </template>
       </template>
@@ -125,8 +125,8 @@ const operate = record => {
   Modal.confirm({
     title:
       record.processed === null || record.processed === false
-        ? '打开盘点单'
-        : '关闭盘点单',
+        ? '关闭盘点单'
+        : '打开盘点单',
     icon: createVNode(ExclamationCircleOutlined),
     content: createVNode(
       'div',
@@ -134,8 +134,8 @@ const operate = record => {
         style: 'color:red;',
       },
       record.processed === null || record.processed === false
-        ? `您确定要打开盘点单:${record.documentNo} 吗?`
-        : `您确定要关闭盘点单:${record.documentNo} 吗?`,
+        ? `您确定要关闭盘点单:${record.documentNo} 吗?`
+        : `您确定要打开盘点单:${record.documentNo} 吗?`,
     ),
     onOk() {
       if (record.processed === null || record.processed === false) {