From 160894a9aa068ba1f93693f3e255ca98c0fd49f0 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 10 Jan 2025 17:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/basic/unitType/index.vue     | 17 ++++++++++++++++-
 src/views/material/part/partAccept/index.vue    |  7 ++++---
 .../part/partArrived/component/addTools.vue     |  4 +++-
 .../part/partArrived/component/home.vue         |  8 +++++---
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/views/material/basic/unitType/index.vue b/src/views/material/basic/unitType/index.vue
index a2648887..85efe76a 100644
--- a/src/views/material/basic/unitType/index.vue
+++ b/src/views/material/basic/unitType/index.vue
@@ -141,7 +141,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典类型">
-          <el-input v-model="form.dictType" :disabled="true" />
+          <el-input v-model="desensitizedDictType" :disabled="true" />
         </el-form-item>
         <el-form-item label="单位类型" prop="dictLabel">
           <el-input v-model="form.dictLabel" placeholder="请输入单位类型" />
@@ -355,7 +355,22 @@ export default {
   created() {
     this.getList();
   },
+  computed: {
+    desensitizedDictType() {
+      const dictType = this.form.dictType;
+      if (!dictType) {
+        return "";
+      }
+      const len = dictType.length;
+      const start = Math.floor(len / 2) - 4;
+      const end = Math.floor(len / 2) + 4;
+      return dictType.substring(0, start) + "****" + dictType.substring(end);
+    },
+  },
   methods: {
+    dictCrypto(value) {
+            return value.replace(reg, "$1****$2")
+      },
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
diff --git a/src/views/material/part/partAccept/index.vue b/src/views/material/part/partAccept/index.vue
index 2c01c869..a87d4305 100644
--- a/src/views/material/part/partAccept/index.vue
+++ b/src/views/material/part/partAccept/index.vue
@@ -89,14 +89,14 @@
         <el-table-column label="采购数量" align="center" prop="purchaseMaNumber" :show-overflow-tooltip="true"/>
         <el-table-column label="物资厂家" align="center" prop="supplier" :show-overflow-tooltip="true"/>
         <el-table-column label="创建人" align="center" prop="createBy" :show-overflow-tooltip="true"/>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="150" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="200" :show-overflow-tooltip="true"/>
         <el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true">
 <!--            <template slot-scope="scope">-->
 <!--                <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>-->
 <!--            </template>-->
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
-        <el-table-column label="操作" align="center" width="250">
+        <el-table-column label="操作" align="center" width="200">
                         <template slot-scope="scope">
                             <el-button
                                 size="mini"
@@ -114,9 +114,10 @@
                             <el-button
                                 size="mini"
                                 type="warning"
+                                v-if="scope.row.taskStatusName == '已完成'"
                                 @click="handlePrint(scope.row)"
                             >
-                                验收单
+                                入库单
                             </el-button>
 
                         </template>
diff --git a/src/views/material/part/partArrived/component/addTools.vue b/src/views/material/part/partArrived/component/addTools.vue
index d35cfd00..4f6ec731 100644
--- a/src/views/material/part/partArrived/component/addTools.vue
+++ b/src/views/material/part/partArrived/component/addTools.vue
@@ -617,7 +617,9 @@ export default {
                         let index2 =this.equipmentList.findIndex(item=>item.purchaseTaxPrice==0)
                         if(index>-1){
                             this.$modal.msgError('采购数量不能为0！')
-                        }else{
+                        }else if(index2>-1){
+                            this.$modal.msgError('含税单价不能为0！')
+                        }else {
                             this.$modal.confirm('是否确认保存当前页面').then(function () {})
                             .then(() => {
                                 if (this.isEdit) {
diff --git a/src/views/material/part/partArrived/component/home.vue b/src/views/material/part/partArrived/component/home.vue
index f5f1daa9..a4ea8f18 100644
--- a/src/views/material/part/partArrived/component/home.vue
+++ b/src/views/material/part/partArrived/component/home.vue
@@ -16,7 +16,7 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          style="width: 240px"
+         
         >
         </el-date-picker>
       </el-form-item>
@@ -110,6 +110,7 @@
         label="采购物资"
         align="center"
         prop="purchaseMaTypeName"
+        width="140"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -178,7 +179,7 @@
                 prop="remark"
                 show-overflow-tooltip
             />
-      <el-table-column label="操作" align="center" width="300">
+      <el-table-column label="操作" align="center" width="230">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -199,7 +200,8 @@
           >
 
           <el-button size="mini" type="warning" @click="handlePrint(scope.row)"
-            >验收单</el-button
+           v-if="scope.row.taskStatusName == '已完成'"
+            >入库单</el-button
           >
 
           <el-button