From 26e1e91d83c44fad6ead21b634b5120350c65d2b Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 6 Dec 2024 11:23:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=E6=96=B9=E5=BC=8F=E5=B0=8F=E6=95=B0=E6=95=B4?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/cost/costApplyDetail.vue   |  8 ++---
 src/views/material/cost/costExameDetail.vue   |  8 ++---
 .../lease/apply/component/addToolsApply.vue   | 12 +++----
 .../lease/apply/component/homeApply.vue       |  2 +-
 .../lease/outBound/component/homeOutBound.vue |  5 +--
 src/views/material/lease/outBound/index.vue   |  3 +-
 src/views/material/ma/type/index.vue          | 32 ++++++++++++++++++-
 .../goodsArrived/component/addTools.vue       | 17 ++++------
 8 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/src/views/material/cost/costApplyDetail.vue b/src/views/material/cost/costApplyDetail.vue
index 4b14f317..51870595 100644
--- a/src/views/material/cost/costApplyDetail.vue
+++ b/src/views/material/cost/costApplyDetail.vue
@@ -35,7 +35,7 @@
                     <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
                     <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/>
                     <el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true"/>
                     <el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true"/>
@@ -56,7 +56,7 @@
                     <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
                     <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="维修状态" align="center" prop="repairStatus" :show-overflow-tooltip="true">
                         <!-- <template slot-scope="scope">
                             <span v-if="scope.row.repairStatus == 0"
@@ -86,7 +86,7 @@
                     <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
                     <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true"/>
                     <el-table-column label="报废原因" align="center" prop="scrapType" :show-overflow-tooltip="true">
                         <!--   <template slot-scope="scope"> -->
@@ -108,7 +108,7 @@
                     <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
                     <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true"/>
                     <el-table-column label="丢失费用" align="center" prop="costs" :show-overflow-tooltip="true"/>
                 </el-table-column>
diff --git a/src/views/material/cost/costExameDetail.vue b/src/views/material/cost/costExameDetail.vue
index 98705db8..068b52eb 100644
--- a/src/views/material/cost/costExameDetail.vue
+++ b/src/views/material/cost/costExameDetail.vue
@@ -43,7 +43,7 @@
                     <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
                     <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/>
                     <el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true"/>
                     <el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true"/>
@@ -63,7 +63,7 @@
                     <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
                     <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="维修状态" align="center" prop="repairStatus" :show-overflow-tooltip="true">
                         <!-- <template slot-scope="scope">
                             <span v-if="scope.row.repairStatus == 0"
@@ -95,7 +95,7 @@
                     <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
                     <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true"/>
                     <el-table-column label="报废原因" align="center" prop="scrapType" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
@@ -117,7 +117,7 @@
                     <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
                     <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                     <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
-                    <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
+                    <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
                     <el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true"/>
                     <el-table-column label="丢失费用" align="center" prop="costs" :show-overflow-tooltip="true"/>
                 </el-table-column>
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index 51a38db4..c8be58ce 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -132,12 +132,12 @@
       <el-table-column align="center" label="当前库存" prop="storageNum" />
       <el-table-column label="预领数量" prop="preNum" align="center">
         <template v-slot="scope">
-          <el-input-number
-            v-model.number="scope.row.preNum"
-            controls-position="right"
-            style="width: 100%"
-            :min="1" :max="scope.row.storageNum"
-          ></el-input-number>
+          <el-input
+              v-model.number="scope.row.preNum"
+              controls-position="right" type="number"
+              style="width: 100%"
+              :min="0" @input="(v)=>(scope.row.unitValue==1?scope.row.preNum=Number(v.replace(/[^\d.]/g,'')) : scope.row.preNum=Number(v.replace(/[^\d]/g,'')))"
+          ></el-input> 
         </template>
       </el-table-column>
 
diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 986541b4..434ba39d 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -240,8 +240,8 @@
           <el-button
             size="mini"
             type="warning"
+            v-if="scope.row.taskStatus != 1"
             @click="handleLld(scope.row)"
-            v-if="scope.row.taskStatus == 4"
             >领料单
           </el-button>
           <el-button
diff --git a/src/views/material/lease/outBound/component/homeOutBound.vue b/src/views/material/lease/outBound/component/homeOutBound.vue
index b4cfd1cb..5c83039f 100644
--- a/src/views/material/lease/outBound/component/homeOutBound.vue
+++ b/src/views/material/lease/outBound/component/homeOutBound.vue
@@ -186,15 +186,12 @@
             type="primary"
             @click="handleUpdate(scope.row)"
             v-if="scope.row.status != '2'"
-       
             >出库</el-button
-          >
-
+          > 
           <el-button
             size="mini"
             type="warning"
             @click="handlePrint(scope.row)"
-            v-if="scope.row.status == '2'"
             >领料单</el-button
           >
           <el-button
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index 3c96c556..c20d8ee7 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -200,8 +200,7 @@
           <el-button
             size="mini"
             type="warning"
-            @click="handleLld(scope.row)"
-            v-if="scope.row.taskStatus == 4"
+            @click="handleLld(scope.row)" 
             >领料单</el-button
           >
           <el-button
diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index fa51e056..491b41ce 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -316,6 +316,35 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="排序" prop="sortNum">
+              <el-input
+                v-model.number="form.sortNum"
+                type="number" :min="0" @input="(v)=>(form.sortNum=v.replace(/[^\d]/g,''))"
+                placeholder="请输入排序"
+                maxlength="10"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计量数值" prop="unitValue"> 
+                <el-select
+                      v-model="form.unitValue"
+                      filterable
+                      placeholder="请选择计量数值"
+                      style="width: 100%" 
+                  >
+                  <el-option
+                      v-for="item in unitValueOptions"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                  ></el-option> 
+                </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
         <el-row>
           <el-col :span="8">
@@ -678,11 +707,12 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      unitValueOptions: [{id:"0",name:"整数"},{id:"1",name:"小数"}],
       // 库管员用户数据
       keeperList: null,
       keeperDataRange: [],
       KeeperOptions: [],
-      repairerOptions: [],
+      repairerOptions: [], 
       //维修员用户数据
       repairUserList: null,
       //资产类型数据
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index 6051b3e5..9f7b2f6c 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -120,18 +120,14 @@
                 show-overflow-tooltip
             />
             <el-table-column align="center" label="单位" prop="unitName" />
-            <el-table-column
-                label="采购数量"
-                prop="purchaseNum"
-                align="center"
-            >
+            <el-table-column label="采购数量" prop="purchaseNum" align="center">
                 <template v-slot="scope">
-                    <el-input-number
-                        v-model="scope.row.purchaseNum"
-                        controls-position="right"
+                    <el-input
+                        v-model.number="scope.row.purchaseNum"
+                        controls-position="right" type="number"
                         style="width: 100%"
-                        :min="0"
-                    ></el-input-number>
+                        :min="0" @input="(v)=>(scope.row.unitValue==1?scope.row.purchaseNum=Number(v.replace(/[^\d.]/g,'')) : scope.row.purchaseNum=Number(v.replace(/[^\d]/g,'')))"
+                    ></el-input>
                 </template>
             </el-table-column>
             <el-table-column
@@ -561,6 +557,7 @@ export default {
                     })
                 })
                 this.equipmentList = newArray_array
+                console.log(this.equipmentList)
             } else {
                 this.equipmentList = []
             }