转换中文

src/views/basicdata/fees/index.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="编号" prop="fNo">
         <el-input
           v-model="queryParams.fNo"
@@ -20,7 +26,12 @@
         />
       </el-form-item>
       <el-form-item label="费用属性" prop="fFeetype">
-        <el-select v-model="queryParams.fFeetype" placeholder="请选择费用属性" clearable size="small">
+        <el-select
+          v-model="queryParams.fFeetype"
+          placeholder="请选择费用属性"
+          clearable
+          size="small"
+        >
           <el-option
             v-for="dict in fFeetypeOptions"
             :key="dict.dictValue"
@@ -30,7 +41,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="计量单位" prop="fFeeunitid">
-        <el-select v-model="queryParams.fFeeunitid" placeholder="请选择计量单位" clearable size="small">
+        <el-select
+          v-model="queryParams.fFeeunitid"
+          placeholder="请选择计量单位"
+          clearable
+          size="small"
+        >
           <el-option
             v-for="dict in fFeeunitidOptions"
             :key="dict.dictValue"
@@ -49,7 +65,7 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="fStatus">
-       <!-- <el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
+        <!-- <el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>-->
         <el-select
@@ -66,12 +82,18 @@
             :value="dict.dictValue"
           />
         </el-select>
-
-
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="cyan"
+          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>
 
@@ -83,7 +105,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['basicdata:fees:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -93,7 +116,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['basicdata:fees:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -103,7 +127,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['basicdata:fees:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -112,14 +137,15 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['basicdata:fees:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-	 <div class="tabSetting">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-         <div style="margin: 0 12px">
+      <div class="tabSetting">
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+        <div style="margin: 0 12px">
           <el-tooltip
             class="item"
             effect="dark"
@@ -136,7 +162,7 @@
         </div>
       </div>
     </el-row>
-       <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
+    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
       <div>配置排序列数据（拖动调整顺序）</div>
       <div style="margin-left: 17px">
         <el-checkbox
@@ -188,9 +214,13 @@
         <el-button type="primary" @click="save()">确 定</el-button>
       </span>
     </el-dialog>
-    <el-table v-loading="loading" :data="feesList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="feesList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" label="序号" align="center"/>
+      <el-table-column type="index" label="序号" align="center" />
       <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
@@ -216,7 +246,13 @@
       <el-table-column label="币种" align="center" prop="fCurrency" :show-overflow-tooltip="true"  />
       <el-table-column label="状态" align="center" prop="fStatus" :formatter="statusFormat" />
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="150"
+        fixed="right"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -224,20 +260,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['basicdata:fees:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['basicdata:fees:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -252,30 +290,57 @@
       :visible.sync="open"
       :close-on-click-modal="false"
       width="80%"
-      append-to-body>
+      append-to-body
+    >
       <template slot="title">
         <div class="avue-crud__dialog__header">
-            <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
+          <span class="el-dialog__title">
+            <span
+              style="
+                display: inline-block;
+                width: 3px;
+                height: 20px;
+                margin-right: 5px;
+                float: left;
+                margin-top: 2px;
+              "
+            ></span>
             添加费用信息
-            </span>
+          </span>
           <div class="avue-crud__dialog__menu enlarge" @click="full">
-            <i  style="cursor: pointer;display: block;width:12px;height:12px;border:1px solid #909399;border-top:3px solid #909399;margin-top: -3px;"></i>
+            <i
+              style="
+                cursor: pointer;
+                display: block;
+                width: 12px;
+                height: 12px;
+                border: 1px solid #909399;
+                border-top: 3px solid #909399;
+                margin-top: -3px;
+              "
+            ></i>
           </div>
         </div>
       </template>
 
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
         <el-row>
           <el-col :span="12">
             <el-form-item label="编号" prop="fNo">
-              <el-input v-model="form.fNo" placeholder="请输入编号" style="width:80%"/>
+              <el-input
+                v-model="form.fNo"
+                placeholder="请输入编号"
+                style="width: 80%"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="名称" prop="fName">
-              <el-input v-model="form.fName" placeholder="请输入名称" style="width:80%" />
+              <el-input
+                v-model="form.fName"
+                placeholder="请输入名称"
+                style="width: 80%"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -283,7 +348,11 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="费用属性" prop="fFeetype">
-              <el-select v-model="form.fFeetype" placeholder="请选择费用属性" style="width:80%">
+              <el-select
+                v-model="form.fFeetype"
+                placeholder="请选择费用属性"
+                style="width: 80%"
+              >
                 <el-option
                   v-for="dict in fFeetypeOptions"
                   :key="dict.dictValue"
@@ -294,8 +363,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="计量单位" prop="fFeeunitid" >
-              <el-select v-model="form.fFeeunitid" placeholder="请选择计量单位" style="width:80%">
+            <el-form-item label="计量单位" prop="fFeeunitid">
+              <el-select
+                v-model="form.fFeeunitid"
+                placeholder="请选择计量单位"
+                style="width: 80%"
+              >
                 <el-option
                   v-for="dict in fFeeunitidOptions"
                   :key="dict.dictValue"
@@ -310,12 +383,20 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="币种" prop="fCurrency">
-              <el-input v-model="form.fCurrency" placeholder="请输入币种" style="width:80%" />
+              <el-input
+                v-model="form.fCurrency"
+                placeholder="请输入币种"
+                style="width: 80%"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="状态" >
-              <el-select v-model="form.fStatus" placeholder="状态" style="width:80%">
+            <el-form-item label="状态">
+              <el-select
+                v-model="form.fStatus"
+                placeholder="状态"
+                style="width: 80%"
+              >
                 <el-option
                   v-for="dict in fDocumentOptions"
                   :key="dict.dictValue"
@@ -327,17 +408,21 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="收付方向">
-              <el-select v-model="form.fDc" placeholder="" style="width:80%">
-                <el-option label="收" value="D"/>
-                <el-option label="付" value="C"/>
-                <el-option label="收付" value="DC"/>
+              <el-select v-model="form.fDc" placeholder="" style="width: 80%">
+                <el-option label="收" value="D" />
+                <el-option label="付" value="C" />
+                <el-option label="收付" value="DC" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -349,74 +434,82 @@
 </template>
 
 <script>
-import { listFees, getFees, delFees, addFees, updateFees, exportFees } from "../../../api/basicdata/fees";
-import Vue from 'vue'
+import {
+  listFees,
+  getFees,
+  delFees,
+  addFees,
+  updateFees,
+  exportFees,
+} from "../../../api/basicdata/fees";
+import Vue from "vue";
 import { addSet, select, resetModule } from "@/api/system/set";
 import Cookies from "js-cookie";
 import draggable from "vuedraggable";
 
-Vue.directive('dialogDrag', {
+Vue.directive("dialogDrag", {
   bind(el, binding, vnode, oldVnode) {
-    const dialogHeaderEl = el.querySelector('.el-dialog__header')
-    const dragDom = el.querySelector('.el-dialog')
-    const enlarge = el.querySelector('.enlarge')
-    dialogHeaderEl.style.cursor = 'move'
+    const dialogHeaderEl = el.querySelector(".el-dialog__header");
+    const dragDom = el.querySelector(".el-dialog");
+    const enlarge = el.querySelector(".enlarge");
+    dialogHeaderEl.style.cursor = "move";
 
     // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
-    if(enlarge){
+    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
+    if (enlarge) {
       enlarge.onclick = (e) => {
-        dragDom.style.top = '0px'
-        dragDom.style.left = '0px'
-      }
+        dragDom.style.top = "0px";
+        dragDom.style.left = "0px";
+      };
     }
     dialogHeaderEl.onmousedown = (e) => {
       // 鼠标按下，计算当前元素距离可视区的距离
-      const disX = e.clientX - dialogHeaderEl.offsetLeft
-      const disY = e.clientY - dialogHeaderEl.offsetTop
+      const disX = e.clientX - dialogHeaderEl.offsetLeft;
+      const disY = e.clientY - dialogHeaderEl.offsetTop;
 
       // 获取到的值带px 正则匹配替换
-      let styL, styT
+      let styL, styT;
 
       // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
-      if (sty.left.includes('%')) {
-        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100)
-        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100)
+      if (sty.left.includes("%")) {
+        styL =
+          +document.body.clientWidth * (+sty.left.replace(/\%/g, "") / 100);
+        styT =
+          +document.body.clientHeight * (+sty.top.replace(/\%/g, "") / 100);
       } else {
-        styL = +sty.left.replace(/\px/g, '')
-        styT = +sty.top.replace(/\px/g, '')
+        styL = +sty.left.replace(/\px/g, "");
+        styT = +sty.top.replace(/\px/g, "");
       }
 
-      document.onmousemove = function(e) {
+      document.onmousemove = function (e) {
         // 通过事件委托，计算移动的距离
-        const l = e.clientX - disX
-        const t = e.clientY - disY
+        const l = e.clientX - disX;
+        const t = e.clientY - disY;
 
         // 移动当前元素
 
-        if ((t + styT) >= 0){
-          dragDom.style.top = `${t + styT}px`
+        if (t + styT >= 0) {
+          dragDom.style.top = `${t + styT}px`;
         }
-        dragDom.style.left = `${l + styL}px`
+        dragDom.style.left = `${l + styL}px`;
         // 将此时的位置传出去
         // binding.value({x:e.pageX,y:e.pageY})
-      }
+      };
 
-      document.onmouseup = function(e) {
-        document.onmousemove = null
-        document.onmouseup = null
-      }
-    }
-  }
-})
+      document.onmouseup = function (e) {
+        document.onmousemove = null;
+        document.onmouseup = null;
+      };
+    };
+  },
+});
 export default {
   name: "Fees",
-  components: {draggable
-  },
+  components: { draggable },
   data() {
     return {
       //全屏放大
-      dialogFull:false,
+      dialogFull: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -456,21 +549,17 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        fNo: [
-          { required: true, message: "编号不能为空", trigger: "blur" }
-        ],
-        fName: [
-          { required: true, message: "名称不能为空", trigger: "blur" }
-        ],
+        fNo: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+        fName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
       },
-        showSetting: false,
+      showSetting: false,
       drag: false,
       setRowList: [],
       getRowList: [],
       tableDate: [
         {
           surface: "1",
-          label: "fTypename",
+          label: "fNo",
           name: "编号",
           checked: 0,
           width: 150,
@@ -522,29 +611,29 @@ export default {
           label: "remark",
           name: "备注",
           checked: 0,
-          width:null,
-        }
+          width: null,
+        },
       ],
       allCheck: false,
     };
   },
   created() {
-      this.setRowList = this.tableDate;
+    this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
-    this.getList();
-    this.getDicts("data_cost_attribute").then(response => {
+    this.getDicts("data_cost_attribute").then((response) => {
       this.fFeetypeOptions = response.data;
     });
-    this.getDicts("document_status").then(response => {
+    this.getDicts("document_status").then((response) => {
       this.fDocumentOptions = response.data;
     });
-    this.getDicts("data_unitfees").then(response => {
+    this.getDicts("data_unitfees").then((response) => {
       this.fFeeunitidOptions = response.data;
     });
     this.getRow();
+    this.getList();
   },
   methods: {
-     //列设置全选
+    //列设置全选
     allChecked() {
       if (this.allCheck == true) {
         this.setRowList.map((e) => {
@@ -618,8 +707,8 @@ export default {
     onEnd() {
       this.drag = false;
     },
-    full(){
-      this.dialogFull = !this.dialogFull
+    full() {
+      this.dialogFull = !this.dialogFull;
     },
     // 费用属性默认为仓储、计量单位默认为毛重
     query() {
@@ -629,7 +718,35 @@ export default {
     /** 查询费用信息列表 */
     getList() {
       this.loading = true;
-      listFees(this.queryParams).then(response => {
+      listFees(this.queryParams).then((response) => {
+        response.rows.map((e) => {
+          this.fFeetypeOptions.map((s) => {
+            if (e.fFeetype == s.dictValue) {
+              e.fFeetype = s.dictLabel;
+            }
+          });
+          if (e.fDc) {
+            if (e.fDc == "D") {
+              e.fDc = "收";
+            }
+            if (e.fDc == "C") {
+              e.fDc = "付";
+            }
+            if (e.fDc == "DC") {
+              e.fDc = "收付";
+            }
+          }
+          this.fFeeunitidOptions.map((s) => {
+            if (e.fFeeunitid == s.dictValue) {
+              e.fFeeunitid = s.dictLabel;
+            }
+          });
+          this.fDocumentOptions.map((s) => {
+            if (e.fStatus == s.dictValue) {
+              e.fStatus = s.dictLabel;
+            }
+          });
+        });
         this.feesList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -667,7 +784,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -683,9 +800,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.fId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.fId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -697,8 +814,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const fId = row.fId || this.ids
-      getFees(fId).then(response => {
+      const fId = row.fId || this.ids;
+      getFees(fId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改费用信息";
@@ -706,16 +823,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.fId != null) {
-            updateFees(this.form).then(response => {
+            updateFees(this.form).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addFees(this.form).then(response => {
+            addFees(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -727,31 +844,39 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const fIds = row.fId || this.ids;
-      this.$confirm('是否确认删除费用信息编号为"' + fIds + '"的数据项?', "警告", {
+      this.$confirm(
+        '是否确认删除费用信息编号为"' + fIds + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+          type: "warning",
+        }
+      )
+        .then(function () {
           return delFees(fIds);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+        });
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有费用信息数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+      this.$confirm("是否确认导出所有费用信息数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
           return exportFees(queryParams);
-        }).then(response => {
-          this.download(response.msg);
         })
-    }
-  }
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+  },
 };
 </script>
 <style lang="scss">
@@ -767,7 +892,7 @@ export default {
   justify-content: space-between;
 }
 .el-dialog__title {
-  color: rgba(0,0,0,.85);
+  color: rgba(0, 0, 0, 0.85);
   font-weight: 500;
   word-wrap: break-word;
 }
@@ -779,7 +904,7 @@ export default {
   color: #909399;
   font-size: 15px;
 }
-.el-icon-full-screen{
+.el-icon-full-screen {
   cursor: pointer;
 }
 .el-icon-full-screen:before {

src/views/basicdata/goods/index.vue

@@ -155,12 +155,12 @@
           >导出</el-button
         >
       </el-col>
-     <div class="tabSetting">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-         <div style="margin: 0 12px">
+      <div class="tabSetting">
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+        <div style="margin: 0 12px">
           <el-tooltip
             class="item"
             effect="dark"
@@ -177,7 +177,7 @@
         </div>
       </div>
     </el-row>
-<el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
+    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
       <div>配置排序列数据（拖动调整顺序）</div>
       <div style="margin-left: 17px">
         <el-checkbox
@@ -237,7 +237,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center" />
       <!--<el-table-column label="存储id" align="center" prop="fTypeid" />--><!-- 后期添加 -->
-               <el-table-column
+      <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
         :label="item.name"
@@ -319,7 +319,8 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="150" fixed="right"
+        width="150"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -469,7 +470,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="按照箱号统计">
               <el-radio-group v-model="form.ifCntrno">
                 <el-radio label="1">是</el-radio>
@@ -478,7 +479,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <el-form-item label="备注" prop="remark">
           <el-input
             v-model="form.remark"
@@ -486,7 +487,7 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-         <el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="商品类别" prop="fTypeid">
               <el-select v-model="form.fTypeid" placeholder="请选择商品类别">
@@ -583,7 +584,7 @@ Vue.directive("dialogDrag", {
 
 export default {
   name: "Goods",
-  components: {draggable},
+  components: { draggable },
   data() {
     return {
       //全屏放大
@@ -709,7 +710,7 @@ export default {
           name: "包装类型",
           checked: 0,
           width: 100,
-        }
+        },
       ],
       allCheck: false,
     };
@@ -717,7 +718,9 @@ export default {
   created() {
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
-    this.getList();
+    this.getDicts("data_goods_category").then((response) => {
+      this.fTypeidOptions = response.data;
+    });
     this.getDicts("data_customer_category").then((response) => {
       this.fIdOptions = response.data;
     });
@@ -727,10 +730,8 @@ export default {
     this.getDicts("sys_normal_disable").then((response) => {
       this.statusOptions = response.data;
     });
-    this.getDicts("data_goods_category").then((response) => {
-      this.fTypeidOptions = response.data;
-    });
     this.getRow();
+    this.getList();
   },
   methods: {
     //列设置全选
@@ -814,6 +815,14 @@ export default {
     getList() {
       this.loading = true;
       listGoods(this.queryParams).then((response) => {
+        response.rows.map((e) => {
+          this.fTypeidOptions.map((s) => {
+            if (e.fTypeid == s.dictSort) {
+              e.fTypeid = s.dictLabel;
+            }
+          });
+        });
+        console.log(response.rows);
         this.goodsList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -856,7 +865,7 @@ export default {
         updateBy: null,
         updateTime: null,
         remark: null,
-        ifCntrno:"0",
+        ifCntrno: "0",
       };
       this.resetForm("form");
     },