1

src/apis/service/goodStore/goldPrice/index.js

@@ -12,4 +12,7 @@ export default {
   add: (data, params) => http(api + "goldpricecreate", data, "post", params),
   // 更新
   update: (data, params) => http(api + "golpriceedit", data, "post", params),
+  // 修改记录
+  ecordList: (data, params) => http(api + "goldpricelist", data, "post", params),
+ 
 };

src/apis/service/goodStore/priceRecord/index.js

@@ -1,9 +0,0 @@
-// 物业管理员
-import http from "@/apis/axios";
-const api = "admin/";
-export default {
-
-  // 分页查询
-  list: (data, params) => http(api + "goldpricelist", data, "post", params),
- 
-};

src/views/goodStore/goldPrice/components/priceList.vue

@@ -0,0 +1,296 @@
+<template>
+  <div class="priceList">
+    <el-row>
+      <el-col :span="4" style="width: 200px">
+        <search-metal-kind
+          :value="parmValue.type"
+          :disabled="false"
+          :isDetail="false"
+          :size="searchSize"
+          :placeholder="'金属类型'"
+          @searchChange="noble_metalsearchChange"
+        />
+      </el-col>
+
+      <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+        <el-button type="primary" :size="searchSize" @click="searchList">
+          刷新
+        </el-button>
+      </el-col>
+      <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+        <el-button type="warning" :size="searchSize" @click="restSearch">
+          重置
+        </el-button>
+      </el-col>
+      <el-col
+        :span="3"
+        class="fr"
+        style="width: 66px; padding: 0 0 0 10px"
+        v-if="powers.some((item) => item == '003')"
+      >
+        <el-button
+          :size="searchSize"
+          type="success"
+          style="float: right"
+          @click="openModal({}, '003')"
+        >
+          添加
+        </el-button>
+      </el-col>
+      <el-col :span="24" style="padding: 10px 0 0 0">
+        <el-table
+          :data="tableData"
+          border
+          stripe
+          :size="'mini'"
+          style="width: 100%"
+        >
+          <el-table-column prop="type_cn" label="贵金属种类" width="180" />
+          <el-table-column prop="price" label="当前金价(元/g)" width="180" />
+          <el-table-column label="状态">
+            <template slot-scope="scope">
+              <el-tag
+                :size="tablebtnSize"
+                :type="scope.row.status == '0' ? 'warning' : ''"
+                v-text="
+                  (
+                    statusOptions.find((item) => item.id == scope.row.status) ||
+                    {}
+                  ).label || '--'
+                "
+              ></el-tag
+            ></template>
+          </el-table-column>
+          <el-table-column prop="action_name" label="创建人" />
+          <el-table-column prop="addtime" label="创建时间" />
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-tooltip
+                v-if="powers.some((item) => item == '007')"
+                effect="dark"
+                content="详情"
+                placement="top"
+              >
+                <i
+                  class="el-icon-view tb-icon"
+                  @click="openModal(scope.row, '007')"
+                ></i>
+              </el-tooltip>
+              <el-tooltip
+                v-if="powers.some((item) => item == '005')"
+                effect="dark"
+                content="修改"
+                placement="top"
+              >
+                <i
+                  class="el-icon-edit tb-icon"
+                  @click="openModal(scope.row, '005')"
+                ></i>
+              </el-tooltip>
+              <el-tooltip
+                v-if="
+                  powers.some((item) => item == '004') &&
+                  scope.row.status === '1'
+                "
+                effect="dark"
+                content="禁用"
+                placement="top"
+              >
+                <i
+                  class="el-icon-video-pause tb-icon"
+                  @click="changeStatus(scope.row.id, scope.row.status)"
+                ></i>
+              </el-tooltip>
+              <el-tooltip
+                v-if="
+                  powers.some((item) => item == '004') &&
+                  scope.row.status === '0'
+                "
+                effect="dark"
+                content="启用"
+                placement="top"
+              >
+                <i
+                  class="el-icon-video-play tb-icon"
+                  @click="changeStatus(scope.row.id, scope.row.status)"
+                ></i>
+              </el-tooltip>
+              <el-tooltip
+                v-if="powers.some((item) => item == '006')"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <i
+                  class="el-icon-delete tb-icon"
+                  @click="deleteItem(scope.row.id)"
+                ></i> </el-tooltip
+            ></template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+
+    <!-- 弹窗 新增/修改 -->
+    <add-edit
+      :id="modelId"
+      :show-model="showModel"
+      :sitem="sitem"
+      @refresh="searchList"
+      @cancel="showModel = false"
+    />
+  </div>
+</template>
+<script>
+import addEdit from "./addEdit";
+import asyncRequest from "@/apis/service/goodStore/goldPrice";
+import mixinPage from "@/mixins/elPaginationHandle";
+import { mapGetters } from "vuex";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "goldPrice",
+  mixins: [mixinPage, resToken],
+  components: {
+    addEdit,
+  },
+  computed: {
+    //组件SIZE设置
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "goldPrice"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
+    return {
+      loading: true,
+      showModel: false,
+      modelId: "000",
+      sitem: {},
+      parmValue: {
+        type: "",
+      },
+      // 状态
+      statusOptions: [
+        { id: "0", label: "禁用" },
+        { id: "1", label: "启用" },
+      ],
+      // 表格 - 数据
+      tableData: [],
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+  methods: {
+    async restSearch() {
+      this.parmValue = {
+        type: "",
+      };
+      await this.searchList();
+    },
+    // 新建/编辑/详情
+    openModal(row, type) {
+      this.sitem = row;
+      this.modelId = type;
+      this.showModel = true;
+    },
+    //贵金属种类选择
+    async noble_metalsearchChange(e) {
+      const { id, code, label } = e;
+      if (id) {
+        this.parmValue.type = id;
+      } else {
+        this.parmValue.type = "";
+      }
+      await this.searchList();
+    },
+    /**
+     * 启用/禁用
+     * @param {String} id id
+     * @param {String} status 0-禁用 1-启用
+     */
+    async changeStatus(id, status) {
+      await this.$confirm(`确定要改为${status === "1" ? "禁用" : "启用"}？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          this.loading = true;
+          const model = {
+            id: id,
+            status: status === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.loading = false;
+            this.$notify.success({
+              title: "状态修改成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.loading = false;
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async deleteItem(id) {
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            id: id,
+          };
+          const res = await asyncRequest.delete(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    // 刷新表格
+    async searchList() {
+      this.loading = true;
+      const res = await asyncRequest.list(this.parmValue);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+      }
+      this.loading = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/goodStore/priceRecord/index.vue → src/views/goodStore/goldPrice/components/priceRecord.vue

@@ -1,8 +1,7 @@
 <template>
-  <div class="priceRecord pagePadding">
+  <div class="priceRecord">
     <ex-table
       v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -80,11 +79,10 @@
         </div></template
       >
     </ex-table>
-    <no-auth v-else></no-auth>
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/goodStore/priceRecord";
+import asyncRequest from "@/apis/service/goodStore/goldPrice";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
@@ -94,17 +92,6 @@ export default {
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "priceRecord"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
   },
   data() {
     return {
@@ -212,7 +199,7 @@ export default {
     // 刷新表格
     async searchList() {
       this.loading = true;
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.ecordList(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);

src/views/goodStore/goldPrice/index.vue

@@ -2,165 +2,31 @@
   <div class="goldPrice pagePadding">
     <el-row
       style="padding: 10px 0 0 0"
-      v-loading="loading"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <el-col :span="4" style="width: 200px">
-        <search-metal-kind
-          :value="parmValue.type"
-          :disabled="false"
-          :isDetail="false"
-          :size="searchSize"
-          :placeholder="'金属类型'"
-          @searchChange="noble_metalsearchChange"
-        />
-      </el-col>
-
-      <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-        <el-button type="primary" :size="searchSize" @click="searchList">
-          刷新
-        </el-button>
-      </el-col>
-      <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-        <el-button type="warning" :size="searchSize" @click="restSearch">
-          重置
-        </el-button>
-      </el-col>
-      <el-col
-        :span="3"
-        class="fr"
-        style="width: 66px; padding: 0 0 0 10px"
-        v-if="powers.some((item) => item == '003')"
-      >
-        <el-button
-          :size="searchSize"
-          type="success"
-          style="float: right"
-          @click="openModal({}, '003')"
-        >
-          添加
-        </el-button>
-      </el-col>
-      <el-col :span="24" style="padding: 10px 0 0 0">
-        <el-table
-          :data="tableData"
-          border
-          stripe
-          :size="'mini'"
-          style="width: 100%"
-        >
-          <el-table-column prop="type_cn" label="贵金属种类" width="180" />
-          <el-table-column prop="price" label="当前金价(元/g)" width="180" />
-          <el-table-column label="状态">
-            <template slot-scope="scope">
-              <el-tag
-                :size="tablebtnSize"
-                :type="scope.row.status == '0' ? 'warning' : ''"
-                v-text="
-                  (
-                    statusOptions.find((item) => item.id == scope.row.status) ||
-                    {}
-                  ).label || '--'
-                "
-              ></el-tag
-            ></template>
-          </el-table-column>
-          <el-table-column prop="action_name" label="创建人" />
-          <el-table-column prop="addtime" label="创建时间" />
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-tooltip
-                v-if="powers.some((item) => item == '007')"
-                effect="dark"
-                content="详情"
-                placement="top"
-              >
-                <i
-                  class="el-icon-view tb-icon"
-                  @click="openModal(scope.row, '007')"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="powers.some((item) => item == '005')"
-                effect="dark"
-                content="修改"
-                placement="top"
-              >
-                <i
-                  class="el-icon-edit tb-icon"
-                  @click="openModal(scope.row, '005')"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="
-                  powers.some((item) => item == '004') &&
-                  scope.row.status === '1'
-                "
-                effect="dark"
-                content="禁用"
-                placement="top"
-              >
-                <i
-                  class="el-icon-video-pause tb-icon"
-                  @click="changeStatus(scope.row.id, scope.row.status)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="
-                  powers.some((item) => item == '004') &&
-                  scope.row.status === '0'
-                "
-                effect="dark"
-                content="启用"
-                placement="top"
-              >
-                <i
-                  class="el-icon-video-play tb-icon"
-                  @click="changeStatus(scope.row.id, scope.row.status)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="powers.some((item) => item == '006')"
-                effect="dark"
-                content="删除"
-                placement="top"
-              >
-                <i
-                  class="el-icon-delete tb-icon"
-                  @click="deleteItem(scope.row.id)"
-                ></i> </el-tooltip
-            ></template>
-          </el-table-column>
-        </el-table>
-      </el-col>
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="当前金价" name="first">
+          <price-list />
+        </el-tab-pane>
+        <el-tab-pane label="修改记录" name="second">
+          <price-record />
+        </el-tab-pane>
+      </el-tabs>
     </el-row>
 
     <no-auth v-else></no-auth>
-    <!-- 弹窗 新增/修改 -->
-    <add-edit
-      :id="modelId"
-      :show-model="showModel"
-      :sitem="sitem"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    />
   </div>
 </template>
 <script>
-import addEdit from "./addEdit";
-import asyncRequest from "@/apis/service/goodStore/goldPrice";
-import mixinPage from "@/mixins/elPaginationHandle";
-import { mapGetters } from "vuex";
-import resToken from "@/mixins/resToken";
+import priceList from "./components/priceList";
+import priceRecord from "./components/priceRecord";
 export default {
   name: "goldPrice",
-  mixins: [mixinPage, resToken],
   components: {
-    addEdit,
+    priceList,
+    priceRecord,
   },
   computed: {
-    //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       let tran =
         this.$store.getters.btnList.find(
@@ -175,125 +41,10 @@ export default {
   },
   data() {
     return {
-      loading: true,
-      showModel: false,
-      modelId: "000",
-      sitem: {},
-      parmValue: {
-        type: "",
-      },
-      // 状态
-      statusOptions: [
-        { id: "0", label: "禁用" },
-        { id: "1", label: "启用" },
-      ],
-      // 表格 - 数据
-      tableData: [],
+      activeName:"first"
     };
   },
-  mounted() {
-    this.searchList();
-  },
-  methods: {
-    async restSearch() {
-      this.parmValue = {
-        type: "",
-      };
-      await this.searchList();
-    },
-    // 新建/编辑/详情
-    openModal(row, type) {
-      this.sitem = row;
-      this.modelId = type;
-      this.showModel = true;
-    },
-    //贵金属种类选择
-    async noble_metalsearchChange(e) {
-      const { id, code, label } = e;
-      if (id) {
-        this.parmValue.type = id;
-      } else {
-        this.parmValue.type = "";
-      }
-      await this.searchList();
-    },
-    /**
-     * 启用/禁用
-     * @param {String} id id
-     * @param {String} status 0-禁用 1-启用
-     */
-    async changeStatus(id, status) {
-      await this.$confirm(`确定要改为${status === "1" ? "禁用" : "启用"}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          this.loading = true;
-          const model = {
-            id: id,
-            status: status === "1" ? "0" : "1",
-          };
-          const res = await asyncRequest.status(model);
-          if (res && res.code === 0) {
-            this.loading = false;
-            this.$notify.success({
-              title: "状态修改成功！",
-              message: "",
-            });
-            await this.searchList();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.loading = false;
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-    async deleteItem(id) {
-      await this.$confirm("确定要删除？", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          const model = {
-            id: id,
-          };
-          const res = await asyncRequest.delete(model);
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "删除成功",
-              message: "",
-            });
-            this.searchList();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-    // 刷新表格
-    async searchList() {
-      this.loading = true;
-      const res = await asyncRequest.list(this.parmValue);
-      if (res && res.code === 0 && res.data) {
-        this.tableData = res.data;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.tableData = [];
-      }
-      this.loading = false;
-    },
-  },
+
 };
 </script>
 

src/views/goodStore/goodsCost/detail.vue

@@ -136,7 +136,7 @@ export default {
               : this.status === "2"
               ? "4"
               : this.status === "3"
-              ? "6"
+              ? "5"
               : "";
         }
         await this.setstatus(type, "提交采购部门审核", e.remark);

src/views/goodStore/goodsCost/index.vue

@@ -241,8 +241,9 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '005') &&
-            (scope.row.status === '7' || scope.row.status === '6')
+            (powers.some((item) => item == '005') &&
+              scope.row.status === '7') ||
+            (powers.some((item) => item == '005') && scope.row.status === '6')
           "
           effect="dark"
           content="修改"
@@ -260,7 +261,9 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '054') && scope.row.status === '1'
+            (powers.some((item) => item == '054') &&
+              scope.row.status === '1') ||
+            (powers.some((item) => item == '054') && scope.row.status === '4')
           "
           effect="dark"
           content="修改基础信息"
@@ -273,7 +276,9 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '053') && scope.row.status === '1'
+            (powers.some((item) => item == '053') &&
+              scope.row.status === '1') ||
+            (powers.some((item) => item == '053') && scope.row.status === '5')
           "
           effect="dark"
           content="修改成本信息"
@@ -415,7 +420,7 @@ export default {
         good_type: "",
         companyNo: "",
         supplierNo: "",
-        isonline:"",
+        isonline: "",
         // creater: "",
       },
       sinput: "",
@@ -441,14 +446,14 @@ export default {
     };
   },
   mounted() {
-    this.select='1'
+    this.select = "1";
     this.supplierNo = [];
     this.brandid = [];
     this.searchList();
   },
   methods: {
     restSearch() {
-      this.select='1'
+      this.select = "1";
       this.supplierNo = [];
       this.brandid = [];
       // 表格 - 分页
@@ -468,7 +473,7 @@ export default {
         cat_id: [],
         brandid: "",
         good_type: "",
-        isonline:"",
+        isonline: "",
         companyNo: "",
         supplierNo: "",
       };