From ae0b637828fbbd95c0dd9817bf3f630973168fde Mon Sep 17 00:00:00 2001
From: jackal <13856223047@163.com>
Date: Tue, 23 Apr 2024 16:16:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E8=B4=AD=E5=B7=A5?=
 =?UTF-8?q?=E6=9C=BA=E5=85=B7=E5=85=A5=E5=BA=93=E5=AE=A1=E6=A0=B8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newDevices/newDevicesWarehousing.vue      | 268 ++++--------------
 sgzb-ui/vue.config.js                         |   6 +-
 2 files changed, 59 insertions(+), 215 deletions(-)

diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 7c8a8773..c4912952 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -1,37 +1,14 @@
 <template>
   <div class="app-container" id="newDevicesWarehousing">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="关键字" prop="keyWord">
-        <el-input
-          v-model="queryParams.keyWord"
-          placeholder="请输入关键字"
-          clearable
-          maxlength="50"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="设备类型" prop="typeId">
-        <el-select
-          v-model="queryParams.typeId"
-          placeholder="请选择设备类型"
-          clearable
-          filterable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="typeItem in typesList"
-            :key="typeItem.typeId"
-            :label="typeItem.typeName"
-            :value="typeItem.typeId"
-          />
+        <el-select v-model="queryParams.typeId" placeholder="请选择设备类型" clearable filterable style="width: 240px">
+          <el-option v-for="typeItem in typesList" :key="typeItem.typeId" :label="typeItem.typeName"
+            :value="typeItem.typeId" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -42,14 +19,8 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:dict:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['system:dict:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -57,62 +28,15 @@
     <el-table v-loading="loading" :data="tableList">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" type="index" width="55px" />
-      <el-table-column
-        label="采购单号"
-        align="center"
-        prop="code"
-        :show-overflow-tooltip="true"
-        width="160"
-      />
-      <el-table-column
-        label="采购日期"
-        align="center"
-        prop="purchaseTime"
-        :show-overflow-tooltip="true"
-        width="100"
-      />
-      <el-table-column
-        label="到货日期"
-        align="center"
-        prop="arrivalTime"
-        :show-overflow-tooltip="true"
-        width="100"
-      />
-      <el-table-column
-        label="采购机具设备"
-        align="center"
-        prop="purchasingTypeName"
-        :show-overflow-tooltip="true"
-        width="250"
-      />
-      <el-table-column
-        label="采购员"
-        align="center"
-        prop="purchaserName"
-        :show-overflow-tooltip="true"
-        width="100"
-      />
-      <el-table-column
-        label="入库人员"
-        align="center"
-        prop="updateBy"
-        :show-overflow-tooltip="true"
-        width="100"
-      />
-      <el-table-column
-        label="入库时间"
-        align="center"
-        prop="updateTime"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
-      <el-table-column
-        label="发布时间"
-        align="center"
-        prop="createTime"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
+      <el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true" width="160" />
+      <el-table-column label="采购日期" align="center" prop="purchaseTime" :show-overflow-tooltip="true" width="100" />
+      <el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" width="100" />
+      <el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true"
+        width="250" />
+      <el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100" />
+      <el-table-column label="入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100" />
+      <el-table-column label="入库时间" align="center" prop="updateTime" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="taskStatus">
         <template slot-scope="scope">
@@ -127,54 +51,25 @@
         <template slot-scope="scope">
           <el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
 
-          <el-button
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            v-if="
-                            scope.row.taskStatus == '26' ||
-                            scope.row.taskStatus == '105'
-                        "
-            @click="handleUpdate(scope.row)"
-          >审核</el-button>
-          <el-button
-            size="mini"
-            type="info"
-            icon="el-icon-edit"
-            v-if="scope.row.taskStatus == '28'"
-            @click="handlePrint(scope.row)"
-          >入库单</el-button>
+          <el-button size="mini" type="primary" icon="el-icon-edit" v-if="
+            scope.row.taskStatus == '26' ||
+            scope.row.taskStatus == '105'
+          " @click="handleUpdate(scope.row)">审核</el-button>
+          <el-button size="mini" type="info" icon="el-icon-edit" v-if="scope.row.taskStatus == '28'"
+            @click="handlePrint(scope.row)">入库单</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!--审批对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form
-        :model="query"
-        ref="query"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="68px"
-      >
+      <el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="关键字" prop="dictName">
-          <el-input
-            v-model="query.dictName"
-            placeholder="请输入关键字"
-            clearable
-            maxlength="50"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="query.dictName" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
 
         <el-form-item>
@@ -200,95 +95,53 @@
         <!--          >导出</el-button>-->
         <!--        </el-col>-->
       </el-row>
-      <el-table
-        v-loading="loading"
-        :data="detailTableList"
-        @selection-change="handleSelectionChange"
-        height="400"
-      >
+      <el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
         <el-table-column type="selection" width="55" align="center" :selectable="selectable" />
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column
-          label="规格型号"
-          align="center"
-          prop="specificationType"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
         <el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
-        <el-table-column
-          label="编号"
-          align="center"
-          prop="maCode"
-          :show-overflow-tooltip="true"
-          width="200"
-        />
+        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" width="200" />
         <el-table-column label="管理模式" align="center" prop="manageType">
           <template slot-scope="scope">
-            <span v-if="scope.row.manageType=='0'">编码管理</span>
-            <span v-if="scope.row.manageType=='1'">数量管理</span>
+            <span v-if="scope.row.manageType == '0'">编码管理</span>
+            <span v-if="scope.row.manageType == '1'">数量管理</span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
-            <span v-if="scope.row.status=='0'">未入库</span>
-            <span v-if="scope.row.status=='1'">已入库</span>
-            <span v-if="scope.row.status=='2'">已驳回</span>
+            <span v-if="scope.row.status == '0'">未入库</span>
+            <span v-if="scope.row.status == '1'">已入库</span>
+            <span v-if="scope.row.status == '2'">已驳回</span>
           </template>
         </el-table-column>
 
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-          v-if="showHandle"
-          width="150"
-        >
-          <template
-            slot-scope="scope"
-            v-if="
-                            scope.row.manageType == '1' ||
-                            (scope.row.manageType == '0' && scope.row.maCode)
-                        "
-          >
-            <el-button
-              size="mini"
-              type="text"
-              v-if="scope.row.status == '0'"
-              @click="pass(scope.row)"
-            >通过</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              v-if="scope.row.status == '0'"
-              @click="refused(scope.row)"
-            >不通过</el-button>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle" width="150">
+          <template slot-scope="scope" v-if="
+            scope.row.manageType == '1' || scope.row.manageType == '2' ||
+            (scope.row.manageType == '0' && scope.row.maCode)
+          ">
+            <el-button size="mini" type="text" v-if="scope.row.status == '0'" @click="pass(scope.row)">通过</el-button>
+            <el-button size="mini" type="text" v-if="scope.row.status == '0'"
+              @click="refused(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination
-        v-show="dialogTotal > 0"
-        :total="dialogTotal"
-        :page.sync="query.pageNum"
-        :limit.sync="query.pageSize"
-        @pagination="getDialogTable"
-      />
+      <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="query.pageNum" :limit.sync="query.pageSize"
+        @pagination="getDialogTable" />
     </el-dialog>
 
     <!-- 入库单弹窗 -->
     <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
       <div style="height: 600px; overflow-y: scroll">
         <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-          <div
-            class="title"
-            style="
+          <div class="title" style="
                             text-align: center;
                             font-weight: 600;
                             font-size: 16px;
-                        "
-          >入库单</div>
+                        ">入库单</div>
           <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
             <!-- <div
               class="item"
@@ -301,15 +154,12 @@
             >
               <span>工程名称：</span>
             </div> -->
-            <div
-              class="item"
-              style="
+            <div class="item" style="
                                 width: 50%;
                                 flex-shrink: 0;
                                 margin-bottom: 5px;
                                 font-size: 14px;
-                            "
-            >
+                            ">
               <span>日期：</span>
             </div>
             <!-- <div
@@ -335,16 +185,11 @@
               <span>车辆信息：</span>
             </div> -->
           </div>
-          <el-table
-            :data="printTableData"
-            class="table"
-            style="
+          <el-table :data="printTableData" class="table" style="
                             margin-top: 20px;
                             padding-bottom: 1px;
                             padding-right: 1px;
-                        "
-            border
-          >
+                        " border>
             <!--          <el-table-column type="selection" width="55" align="center" />-->
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column label="类型名称" align="center" prop="typeName" />
@@ -355,14 +200,11 @@
             <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
           </el-table>
 
-          <div
-            class="fillIn"
-            style="
+          <div class="fillIn" style="
                             margin-top: 20px;
                             display: flex;
                             justify-content: space-between;
-                        "
-          >
+                        ">
             <div class="item" style="width: 25%">
               <span>审核：</span>
             </div>
@@ -711,6 +553,7 @@ export default {
     font-weight: 600;
     font-size: 16px;
   }
+
   .info {
     margin-top: 10px;
     display: flex;
@@ -730,6 +573,7 @@ export default {
     justify-content: space-between;
   }
 }
+
 ::v-deep.el-table .fixed-width .el-button--mini {
   width: 60px !important;
   margin-bottom: 10px;
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 7520d4d8..7bdc90ee 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -35,14 +35,14 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target:  `http://112.29.103.165:21626`,//线上环境-重庆
+        // target: `http://112.29.103.165:21626`, //线上环境-重庆
         // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
-        target: `http://192.168.0.14:21624`,//测试环境
+        // target: `http://192.168.0.14:21624`, //测试环境
         // target: `http://1.12.248.179:23028`,//线上环境-南网
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://10.40.92.8:8080`, //超
+        target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.153:8080`, //帅