From 779eb161fd7270e299e5579b87e8a9a75660f5c4 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 22 Jul 2024 14:59:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/material/seekByTrans.js               |   2 +
 src/views/modules/material/seekByRolls.vue    |   2 +-
 src/views/modules/material/seekInvByRolls.vue | 103 +++++++++++++++---
 3 files changed, 91 insertions(+), 16 deletions(-)

diff --git a/src/api/material/seekByTrans.js b/src/api/material/seekByTrans.js
index aa77085..3767885 100644
--- a/src/api/material/seekByTrans.js
+++ b/src/api/material/seekByTrans.js
@@ -12,3 +12,5 @@ export const findByRolls= data => createAPI(`/seek/trans/findByRolls`,'post',dat
 export const findByNumOrRollNo= data => createAPI(`/seek/trans/findByNumOrRollNo`,'post',data)
 
 export const findAllByRolls= data => createAPI(`/seek/trans/findAllByRolls`,'post',data)
+export const freeze= data => createAPI(`/seek/trans/freeze`,'post',data)
+export const notFreeze= data => createAPI(`/seek/trans/notFreeze`,'post',data)
diff --git a/src/views/modules/material/seekByRolls.vue b/src/views/modules/material/seekByRolls.vue
index 7ebc0b9..a94b1ea 100644
--- a/src/views/modules/material/seekByRolls.vue
+++ b/src/views/modules/material/seekByRolls.vue
@@ -56,7 +56,7 @@
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
         :fixed="item.fixed==''?false:item.fixed"
-        :width="item.columnWidth"
+        :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
diff --git a/src/views/modules/material/seekInvByRolls.vue b/src/views/modules/material/seekInvByRolls.vue
index d8a3104..ad9ff76 100644
--- a/src/views/modules/material/seekInvByRolls.vue
+++ b/src/views/modules/material/seekInvByRolls.vue
@@ -16,6 +16,13 @@
       <el-form-item :label="'卷号:'">
         <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'是否冻结:'">
+        <el-select v-model="searchData.freezeflag" placeholder="请选择" style="width: 120px">
+          <el-option label="Y" value= "Y"></el-option>
+          <el-option label="N" value= "N"></el-option>
+          <el-option label="全部" value=""></el-option>
+        </el-select>
+      </el-form-item>
 
       <el-form-item :label="'查询在库或全部:'">
         <el-select v-model="searchData.qtyOnHand" placeholder="请选择" style="width: 120px">
@@ -58,6 +65,18 @@
       highlight-current-row
       ref="mainTable"
       style="width: 100%;">
+      <el-table-column
+        header-align="center"
+        align="center"
+        width="80"
+        fixed="left"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" v-if="scope.row.freezeflag==='N'&&scope.row.qtyOnHand>0" @click="freeze(scope.row)">冻结</a>
+          <a type="text" size="small" v-if="scope.row.freezeflag==='Y'" @click="notFreeze(scope.row)">解冻</a>
+
+        </template>
+      </el-table-column>
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
         :sortable="item.columnSortable"
@@ -66,7 +85,7 @@
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
         :fixed="item.fixed==''?false:item.fixed"
-        :width="item.columnWidth"
+        :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
@@ -92,7 +111,9 @@
 <script>
 import {
   findAllByRolls, // 检验方法查询
-  findAllByRollsOrRollNo //查询卷明细
+  findAllByRollsOrRollNo ,//查询卷明细
+  freeze,
+  notFreeze,
 } from "@/api/material/seekByTrans.js"
 // import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
 // import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@@ -116,6 +137,7 @@ export default {
       // 导出 end
       searchData: {
         site: '',
+        freezeflag:'',
         userName: this.$store.state.user.name,
         transDate: '',
         warehouseID: '',
@@ -164,7 +186,7 @@ export default {
           serialNumber: '200005TableWarehouseId',
           tableId: "200005Table",
           tableName: "仓位编码",
-          columnWidth: 142,
+          columnWidth: 80,
           columnProp: 'warehouseID',
           headerAlign: 'left',
           align: "left",
@@ -182,7 +204,7 @@ export default {
           serialNumber: '200005TablePartNo',
           tableId: "200005Table",
           tableName: "物料编码",
-          columnWidth: 142,
+          columnWidth: 80,
           columnProp: 'partNo',
           headerAlign: 'left',
           align: "left",
@@ -200,7 +222,7 @@ export default {
           serialNumber: '200005TablePartDesc',
           tableId: "200005Table",
           tableName: "料号描述",
-          columnWidth: 142,
+          columnWidth: 150,
           columnProp: 'partDesc',
           headerAlign: 'left',
           align: "left",
@@ -218,7 +240,7 @@ export default {
           serialNumber: '200004TableRollNo',
           tableId: "200004Table",
           tableName: "卷号",
-          columnWidth: 145,
+          columnWidth: 100,
           columnProp: 'rollNo',
           headerAlign: 'center',
           align: "center",
@@ -236,7 +258,7 @@ export default {
           serialNumber: '200005TableQtyOnHand',
           tableId: "200005Table",
           tableName: "库存数量",
-          columnWidth: 145,
+          columnWidth: 80,
           columnProp: 'qtyOnHand',
           headerAlign: 'right',
           align: "right",
@@ -248,14 +270,31 @@ export default {
           status: true,
           fixed: '',
         },
-
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200005,
+          serialNumber: '200005TableFreezeFlag',
+          tableId: "200005Table",
+          tableName: "库存数量",
+          columnWidth: 80,
+          columnProp: 'freezeflag',
+          headerAlign: 'center',
+          align: "center",
+          columnLabel: '是否冻结',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 200005,
           serialNumber: '200005TableBatchNo',
           tableId: "200005Table",
           tableName: "批号",
-          columnWidth: 145,
+          columnWidth: 100,
           columnProp: 'batchNo',
           headerAlign: 'left',
           align: "left",
@@ -273,7 +312,7 @@ export default {
           serialNumber: '200005TableLocationID',
           tableId: "200005Table",
           tableName: "库位",
-          columnWidth: 145,
+          columnWidth: 80,
           columnProp: 'locationID',
           headerAlign: 'left',
           align: "left",
@@ -291,7 +330,7 @@ export default {
           serialNumber: '200005TableManufactureDate',
           tableId: "200005Table",
           tableName: "生产日期",
-          columnWidth: 145,
+          columnWidth: 100,
           columnProp: 'manufactureDate',
           headerAlign: 'center',
           align: "center",
@@ -309,7 +348,7 @@ export default {
           serialNumber: '200005TableFirstInDate',
           tableId: "200005Table",
           tableName: "首次入库日期",
-          columnWidth: 145,
+          columnWidth: 120,
           columnProp: 'FirstInDate',
           headerAlign: 'center',
           align: "center",
@@ -327,7 +366,7 @@ export default {
           serialNumber: '200005TableExpiredDate',
           tableId: "200005Table",
           tableName: "失效日期",
-          columnWidth: 145,
+          columnWidth: 120,
           columnProp: 'expiredDate',
           headerAlign: 'center',
           align: "center",
@@ -345,7 +384,7 @@ export default {
           serialNumber: '200005TableDaysUntilExpired',
           tableId: "200005Table",
           tableName: "剩余有效期天数",
-          columnWidth: 145,
+          columnWidth: 90,
           columnProp: 'daysUntilExpired',
           headerAlign: 'right',
           align: "right",
@@ -686,7 +725,41 @@ export default {
         }
       })
     },
-
+    notFreeze(row){
+
+      this.$confirm('确定要解冻这个卷?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        notFreeze(row).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message.success( '操作成功')
+            this.getDataList();
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      }).catch(() => {
+      })
+    },
+    freeze(row){
+      this.$confirm('确定要冻结这个卷?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        freeze(row).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message.success( '操作成功')
+            this.getDataList();
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      }).catch(() => {
+      })
+    },
     // 获取 tableDefault 列
     async getColumnList (tableId, columnId) {
       let queryTable = {