snow 2 anos atrás
pai
commit
1a50b563e6

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/0.js


+ 25 - 9
src/views/goodStore/supplierGoodsCost/detail.vue

@@ -14,7 +14,22 @@
         </el-tab-pane>
         <el-tab-pane label="商品成本详情" name="1" v-if="queryType !== 'add'">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="基础信息" name="1">
+            <tempalte v-if="queryType === 'editCoin' || queryType === 'editBase' || queryType === 'edit'">
+              <el-collapse-item title="商品成本详情" name="0">
+              <base-form
+                v-if="newTime !== ''"
+                :type="queryType"
+                :id="queryId"
+                :newTime="newTime"
+                :sitem="sitem"
+                @refresh="refresh"
+              />
+            </el-collapse-item>
+            </tempalte>
+       
+
+            <template v-else>
+              <el-collapse-item title="基础信息" name="1">
               <show-data-table :columns="basicColumns" :sitem="sitem">
                 <template slot="cat_info">
                   {{sitem.cat_info ? sitem.cat_info.map(({name}) => name).join('_') : '--' }}
@@ -80,7 +95,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="固定与阶梯成本" name="6">
+            <el-collapse-item title="固定与阶梯成本" name="6" v-if="displayCostField">
               <show-data-table :columns="ladderColumns" :sitem="sitem">
                 <template slot="demo_fee">{{sitem.demo_fee}}元</template>
                 <template slot="open_fee">{{sitem.open_fee}}元</template>
@@ -120,6 +135,7 @@
                 @searchChange="examForm"
               />
             </el-collapse-item>
+            </template>
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
@@ -133,7 +149,7 @@
 
 
         <el-tab-pane label="流程图" name="3" v-if="queryType !== 'add'">
-          <flow-chart process_id="15" type="SPCB" :orderCode="queryId" @click="handleConsole" />
+          <flow-chart process_id="15" type="SPCB" :orderCode="queryId" />
        </el-tab-pane>
       </el-tabs>
     </div>
@@ -152,7 +168,7 @@ import ShowDataTable from '@/views/standingBook/components/detail-data-table.vue
 import { basicColumns, packingColumns, sendColumns, imageColumns, ladderColumns } from './columns'
 
 export default {
-  name: "goodsCostDetail",
+  name: "supplierGoodsCostDetail",
   mixins: [resToken],
   components: {
     ShowDataTable,
@@ -160,7 +176,10 @@ export default {
     costForm
   },
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field", "originLevel"]),
+    displayCostField(){
+      return (["1", '3']).includes(this.originLevel) || this.private_field.includes('1')
+    },
     powers() {
       const { btnList } = this.$store.getters
       const tran = btnList.find((item) => item.menu_route == "supplierGoodsCostDetail") || {};
@@ -238,9 +257,6 @@ export default {
         await this.setstatus(type, "提交采购部门审核", e.remark);
       }
     },
-    handleConsole(){
-      console.log(this.private_field)
-    },
     async getArea(prop = 'delivery_place'){
       const chunks = this.sitem[prop].split(',');
       let { data: province } = await asyncRequest.province();
@@ -284,7 +300,7 @@ export default {
       console.log(row);
     },
     async refresh(e) {
-      await this.routeReGoto("supplierGoodsCost", {});
+      await this.routeReGoto("goodsCost", {});
     },
     async initData() {
       this.loading = true;

+ 2 - 1
src/views/goodStore/supplierGoodsCost/index.vue

@@ -411,6 +411,7 @@ export default {
       const tran =
         this.$store.getters.roleProcess.find((i) => i.process_type === "SPCB") || {};
       const { action } = tran ?? {};
+      console.log(action)
       return action ?? [];
     },
   },
@@ -642,7 +643,7 @@ export default {
       if (code === 0) {
         const { is_allow_update } = data;
         if (is_allow_update + "" === "1") {
-          this.routeGoto("goodsCostDetail", {
+          this.routeGoto("supplierGoodsCostDetail", {
             id: spuCode,
             type: wtype === "2" ? "editBase" : wtype === "3" ? "editCoin" : "",
           });

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff