Merge remote-tracking branch 'origin/dev-nx' into dev-nx

sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue

@@ -206,6 +206,7 @@
                 align="center"
                 prop="createTimes"
                 show-overflow-tooltip
+                sortable
             />
             <el-table-column
                 label="任务状态"

sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue

@@ -201,6 +201,7 @@
                 align="center"
                 prop="createTimes"
                 :show-overflow-tooltip="true"
+                sortable
             />
             <el-table-column
                 label="任务状态"

sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue

@@ -24,6 +24,7 @@
                     placeholder="请选择单位名称"
                     clearable
                     filterable
+                    @change="unitChange"
                 >
                     <el-option
                         v-for="item in unitList"
@@ -265,6 +266,13 @@
                     prop="typeModelName"
                     :show-overflow-tooltip="true"
                 />
+                <el-table-column
+                    label="工程"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    {{ detailsProName }}
+                </el-table-column>
                 <el-table-column
                     label="待出库数量"
                     align="center"
@@ -766,6 +774,8 @@ export default {
                 outerVisible: false,
                 center: true,
             },
+            // 弹框内工程名称
+            detailsProName: '',
         }
     },
 
@@ -790,10 +800,9 @@ export default {
             })
         },
         //获取单位
-        getProList() {
+        async getProList(id) {
-            getProData().then((response) => {
+            const { data: res } = await getProData({ id })
-                this.proList = response.data
+            this.proList = res
-            })
         },
         getTypeList() {
             getTypeList({ level: '3' }).then((response) => {
@@ -838,6 +847,7 @@ export default {
         resetQuery() {
             this.resetForm('queryForm')
             this.handleQuery()
+            this.getProList()
         },
         /** 查询列表 */
         getList() {
@@ -850,11 +860,12 @@ export default {
         },
         //查看按钮
         handleView(row) {
+            this.detailsProName = row.proName
             this.openLeaseDevices = true
             this.isView = true
             this.dialogQuery.id = row.id
             this.resetDialogQuery()
-            // this.getDialogList();
+            this.getDialogList()
         },
         /** 查询列表 */
         getDialogList() {
@@ -874,6 +885,7 @@ export default {
         },
         /** 出库按钮操作 */
         handleOut(row) {
+            this.detailsProName = row.proName
             this.openLeaseDevices = true
             this.isView = false
             this.dialogQuery.id = row.id
@@ -1071,6 +1083,11 @@ export default {
         handlePrinting() {
             this.$refs.remarksPrintRef.print()
         },
+
+        // 单位名称选择后 获取对应的工程
+        unitChange(val) {
+            this.getProList(val)
+        },
     },
 }
 </script>

sgzb-ui/src/views/claimAndreturn/picking/query/index.vue

@@ -159,13 +159,13 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="领料数量"
+                label="出库数量"
                 align="center"
                 prop="preNum"
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="领料人"
+                label="申请人"
                 align="center"
                 prop="leasePerson"
                 :show-overflow-tooltip="true"
@@ -187,6 +187,7 @@
                 align="center"
                 prop="createTime"
                 :show-overflow-tooltip="true"
+                sortable
             />
             <el-table-column
                 label="领料单位"

sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue

@@ -213,6 +213,7 @@
                 align="center"
                 prop="backTime"
                 :show-overflow-tooltip="true"
+                sortable
             />
             <el-table-column
                 label="协议号"

sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue

@@ -212,6 +212,7 @@
                 label="申请时间"
                 align="center"
                 prop="backTime"
+                sortable
                 :show-overflow-tooltip="true"
             />
             <el-table-column
@@ -226,7 +227,7 @@
                 prop="dictName"
                 :show-overflow-tooltip="true"
             >
-                <template slot-scope="scope">
+                <template>
                     <div>
                         <!-- 暂时全部未否 -->
                         否

sgzb-ui/src/views/claimAndreturn/return/query/index.vue

@@ -179,6 +179,7 @@
                 align="center"
                 prop="createTime"
                 :show-overflow-tooltip="true"
+                sortable
             />
             <el-table-column
                 label="退料单位"

sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue

@@ -857,10 +857,8 @@ export default {
             // 1、查询所有设备是否编辑退料完成 2、查询编辑的设备是否有报废的数据
             const { taskId } = this.sendParams
             const { data: res } = await getScrapReturnOverQueryApi({ taskId })
-            console.log(res, '查询结果=======')
 
             if (res == 0) {
-                console.log('存在未退料数据')
                 this.$message.error(
                     '当前存在未退料机具，请处理之后再点击完成退料！',
                 )
@@ -871,17 +869,14 @@ export default {
                 this.dialogConfigReturn.outerTitle = '选择审批部门'
                 this.dialogConfigReturn.outerWidth = '50%'
                 this.dialogConfigReturn.outerVisible = true
-                console.log('存在报废数据')
             }
             if (res == 2) {
-                console.log('不存在报废数据')
                 let endBackParams = {
                     createBy: sessionStorage.getItem('userId'),
                     taskId: this.sendTbParams.taskId,
                 }
 
                 const res = await getScrapReturnCompleteApi(endBackParams)
-                console.log(res, '退料结果')
             }
         },
 

sgzb-ui/src/views/stquery/projUsingRecord.vue

@@ -16,6 +16,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    style="width: 240px"
                 >
                 </el-date-picker>
             </el-form-item>
@@ -24,7 +25,7 @@
                     v-model="queryParams.unitId"
                     filterable
                     clearable
-                    @change="GetProData"
+                    @change="unitChange"
                     style="width: 240px"
                     placeholder="请选择"
                 >
@@ -42,7 +43,6 @@
                     v-model="queryParams.proId"
                     filterable
                     clearable
-                    @change="GetUnitData"
                     style="width: 240px"
                     placeholder="请选择"
                 >
@@ -290,13 +290,9 @@ export default {
             console.log('GetUnitData ======================', res)
         },
         // 获取 工程名称 列表数据
-        async getProList() {
+        async getProList(id) {
-            const params = {
+            const { data: res } = await getProData({ id })
-                id: this.queryParams.unitId,
+            this.proList = res
-            }
-            const res = await getProData(params)
-            this.proList = res.data
-            console.log('GetProData ======================', res)
         },
 
         // 表单重置
@@ -317,6 +313,7 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
+            this.getProList()
             this.queryParams.time = []
             this.queryParams.unitId = ''
             this.queryParams.proId = ''
@@ -334,6 +331,10 @@ export default {
                 `综合查询_退料记录_${new Date().getTime()}.xlsx`,
             )
         },
+        // 单位名称选择后 获取对应的工程
+        unitChange(val) {
+            this.getProList(val)
+        },
     },
 }
 </script>

sgzb-ui/src/views/system/dict/index.vue

@@ -1,16 +1,23 @@
 <template>
-  <div class="app-container">
+    <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
-      <el-form-item label="字典名称" prop="name">
+            :model="queryParams"
-        <el-input
+            ref="queryForm"
-          v-model="queryParams.name"
+            size="small"
-          placeholder="请输入字典名称"
+            :inline="true"
-          clearable
+            v-show="showSearch"
-          style="width: 240px"
+            label-width="68px"
-          @keyup.enter.native="handleQuery"
+        >
-        />
+            <el-form-item label="字典名称" prop="name">
-      </el-form-item>
+                <el-input
-      <!-- <el-form-item label="字典类型" prop="dictType">
+                    v-model="queryParams.name"
+                    placeholder="请输入字典名称"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <!-- <el-form-item label="字典类型" prop="dictType">
         <el-input
           v-model="queryParams.dictType"
           placeholder="请输入字典类型"
@@ -19,328 +26,407 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="状态" prop="status">
+            <el-form-item label="状态" prop="status">
-        <el-select
+                <el-select
-          v-model="queryParams.status"
+                    v-model="queryParams.status"
-          placeholder="字典状态"
+                    placeholder="字典状态"
-          clearable filterable
+                    clearable
-          style="width: 240px"
+                    filterable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="dict in dict.type.sys_normal_disable"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间">
+                <el-date-picker
+                    v-model="dateRange"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd"
+                    type="daterange"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >搜索</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    v-hasPermi="['system:dict:add']"
+                    >新增</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-edit"
+                    size="mini"
+                    :disabled="single"
+                    @click="handleUpdate"
+                    v-hasPermi="['system:dict:edit']"
+                    >修改</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="el-icon-delete"
+                    size="mini"
+                    :disabled="multiple"
+                    @click="handleDelete"
+                    v-hasPermi="['system:dict:remove']"
+                    >删除</el-button
+                >
+            </el-col>
+            <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-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="handleRefreshCache"
+                    v-hasPermi="['system:dict:remove']"
+                    >刷新缓存</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table
+            v-loading="loading"
+            :data="typeList"
+            @selection-change="handleSelectionChange"
         >
-          <el-option
+            <el-table-column type="selection" width="55" align="center" />
-            v-for="dict in dict.type.sys_normal_disable"
+            <el-table-column label="字典编号" align="center" prop="id" />
-            :key="dict.value"
+            <!-- <el-table-column label="字典名称" align="center" prop="name" :show-overflow-tooltip="true" /> -->
-            :label="dict.label"
+            <el-table-column
-            :value="dict.value"
+                label="字典名称"
-          />
+                align="center"
-        </el-select>
+                :show-overflow-tooltip="true"
-      </el-form-item>
+            >
-      <el-form-item label="创建时间">
+                <template slot-scope="scope">
-        <el-date-picker
+                    <router-link
-          v-model="dateRange"
+                        :to="'/system/dict-data/index/' + scope.row.id"
-          style="width: 240px"
+                        class="link-type"
-          value-format="yyyy-MM-dd"
+                    >
-          type="daterange"
+                        <span>{{ scope.row.name }}</span>
-          range-separator="-"
+                    </router-link>
-          start-placeholder="开始日期"
+                </template>
-          end-placeholder="结束日期"
+            </el-table-column>
-        ></el-date-picker>
+            <el-table-column label="状态" align="center" prop="status">
-      </el-form-item>
+                <template slot-scope="scope">
-      <el-form-item>
+                    <dict-tag
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                        :options="dict.type.sys_normal_disable"
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                        :value="scope.row.status"
-      </el-form-item>
+                    />
-    </el-form>
+                </template>
+            </el-table-column>
+            <!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
+            <el-table-column
+                label="创建时间"
+                align="center"
+                prop="createTime"
+                width="180"
+            >
+                <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:dict:edit']"
+                        >修改</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:dict:remove']"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
 
-    <el-row :gutter="10" class="mb8">
+        <pagination
-      <el-col :span="1.5">
+            v-show="total > 0"
-        <el-button
+            :total="total"
-          type="primary"
+            :page.sync="queryParams.pageNum"
-          plain
+            :limit.sync="queryParams.pageSize"
-          icon="el-icon-plus"
+            @pagination="getList"
-          size="mini"
+        />
-          @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:dict:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
-        >删除</el-button>
-      </el-col>
-      <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-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-refresh"
-          size="mini"
-          @click="handleRefreshCache"
-          v-hasPermi="['system:dict:remove']"
-        >刷新缓存</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+        <!-- 添加或修改参数配置对话框 -->
-      <el-table-column type="selection" width="55" align="center" />
+        <el-dialog
-      <el-table-column label="字典编号" align="center" prop="id" />
+            :title="title"
-      <!-- <el-table-column label="字典名称" align="center" prop="name" :show-overflow-tooltip="true" /> -->
+            :visible.sync="open"
-      <el-table-column label="字典名称" align="center" :show-overflow-tooltip="true">
+            width="500px"
-        <template slot-scope="scope">
+            append-to-body
-          <router-link :to="'/system/dict-data/index/' + scope.row.id" class="link-type">
+        >
-            <span>{{ scope.row.name }}</span>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          </router-link>
+                <el-form-item label="字典名称" prop="name">
-        </template>
+                    <el-input
-      </el-table-column>
+                        v-model="form.name"
-      <el-table-column label="状态" align="center" prop="status">
+                        placeholder="请输入字典名称"
-        <template slot-scope="scope">
+                    />
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+                </el-form-item>
-        </template>
+                <!-- <el-form-item label="字典类型" prop="dictType">
-      </el-table-column>
-      <!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dict:remove']"
-          >删除</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"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <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="字典名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入字典名称" />
-        </el-form-item>
-        <!-- <el-form-item label="字典类型" prop="dictType">
           <el-input v-model="form.dictType" placeholder="请输入字典类型" />
         </el-form-item> -->
-        <el-form-item label="状态" prop="status">
+                <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
+                    <el-radio-group v-model="form.status">
-            <el-radio
+                        <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
+                            v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
+                            :key="dict.value"
-              :label="dict.value"
+                            :label="dict.value"
-            >{{dict.label}}</el-radio>
+                            >{{ dict.label }}</el-radio
-          </el-radio-group>
+                        >
-        </el-form-item>
+                    </el-radio-group>
-        <el-form-item label="备注" prop="remark">
+                </el-form-item>
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+                <el-form-item label="备注" prop="remark">
-        </el-form-item>
+                    <el-input
-      </el-form>
+                        v-model="form.remark"
-      <div slot="footer" class="dialog-footer">
+                        type="textarea"
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+                        placeholder="请输入内容"
-        <el-button @click="cancel">取 消</el-button>
+                    ></el-input>
-      </div>
+                </el-form-item>
-    </el-dialog>
+            </el-form>
-  </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listType, refreshCache } from "@/api/system/dict/type";
+import { listType, refreshCache } from '@/api/system/dict/type'
-import { addDictData,updateDictData,delDictData} from "@/api/system/dict/data";
+import {
+    addDictData,
+    updateDictData,
+    delDictData,
+} from '@/api/system/dict/data'
 export default {
-  name: "Dict",
+    name: 'Dict',
-  dicts: ['sys_normal_disable'],
+    dicts: ['sys_normal_disable'],
-  data() {
+    data() {
-    return {
+        return {
-      // 遮罩层
+            // 遮罩层
-      loading: true,
+            loading: true,
-      // 选中数组
+            // 选中数组
-      ids: [],
+            ids: [],
-      // 非单个禁用
+            // 非单个禁用
-      single: true,
+            single: true,
-      // 非多个禁用
+            // 非多个禁用
-      multiple: true,
+            multiple: true,
-      // 显示搜索条件
+            // 显示搜索条件
-      showSearch: true,
+            showSearch: true,
-      // 总条数
+            // 总条数
-      total: 0,
+            total: 0,
-      // 字典表格数据
+            // 字典表格数据
-      typeList: [],
+            typeList: [],
-      // 弹出层标题
+            // 弹出层标题
-      title: "",
+            title: '',
-      // 是否显示弹出层
+            // 是否显示弹出层
-      open: false,
+            open: false,
-      // 日期范围
+            // 日期范围
-      dateRange: [],
+            dateRange: [],
-      // 查询参数
+            // 查询参数
-      queryParams: {
+            queryParams: {
-        pageNum: 1,
+                pageNum: 1,
-        pageSize: 10,
+                pageSize: 10,
-        id:'0',
+                id: '0',
-        name: undefined,
+                name: undefined,
-        dictType: undefined,
+                dictType: undefined,
-        status: undefined
+                status: undefined,
-      },
+            },
-      // 表单参数
+            // 表单参数
-      form: {},
+            form: {},
-      // 表单校验
+            // 表单校验
-      rules: {
+            rules: {
-        name: [
+                name: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
+                    {
-        ],
+                        required: true,
-        dictType: [
+                        message: '字典名称不能为空',
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
+                        trigger: 'blur',
-        ]
+                    },
-      }
+                ],
-    };
+                dictType: [
-  },
+                    {
-  created() {
+                        required: true,
-    this.getList();
+                        message: '字典类型不能为空',
-  },
+                        trigger: 'blur',
-  methods: {
+                    },
-    /** 查询字典类型列表 */
+                ],
-    getList() {
+            },
-      this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
         }
-      );
     },
-    // 取消按钮
+    created() {
-    cancel() {
+        this.getList()
-      this.open = false;
-      this.reset();
     },
-    // 表单重置
+    methods: {
-    reset() {
+        /** 查询字典类型列表 */
-      this.form = {
+        getList() {
-        pId: '0',
+            this.loading = true
-        name: undefined,
+            listType(this.addDateRange(this.queryParams, this.dateRange)).then(
-        dictType: undefined,
+                (response) => {
-        status: "0",
+                    this.typeList = response.rows
-        remark: undefined
+                    this.total = response.total
-      };
+                    this.loading = false
-      this.resetForm("form");
+                },
+            )
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                pId: '0',
+                name: undefined,
+                dictType: undefined,
+                status: '0',
+                remark: undefined,
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加字典类型'
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.pId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            let formData = row
+            this.form = formData
+            this.open = true
+            this.title = '修改字典类型'
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.title === '修改字典类型') {
+                        updateDictData(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        addDictData(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const dictIds = row.pId || this.ids
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return delDictData(dictIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'system/dict/type/export',
+                {
+                    ...this.queryParams,
+                },
+                `type_${new Date().getTime()}.xlsx`,
+            )
+        },
+        /** 刷新缓存按钮操作 */
+        handleRefreshCache() {
+            refreshCache().then(() => {
+                this.$modal.msgSuccess('刷新成功')
+                this.$store.dispatch('dict/cleanDict')
+            })
+        },
     },
-    /** 搜索按钮操作 */
+}
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加字典类型";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.pId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-        this.reset();
-        let formData = row
-        this.form = formData;
-        this.open = true;
-        this.title = "修改字典类型";
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.pId != undefined) {
-            updateDictData(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addDictData(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.pId || this.ids;
-      this.$modal.confirm('是否确认删除所选择的数据项？').then(function() {
-        return delDictData(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
-    }
-  }
-};
 </script>

sgzb-ui/vue.config.js

@@ -43,7 +43,7 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://192.168.2.122:28080`, //超
+        target: `http://192.168.2.167:28080`, //超
         // target: `http://10.40.92.81:28080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://192.168.2.248:28080`, //帅