5.17

yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/api/Zhj/inquireStatistics/index.js

@@ -66,4 +66,15 @@ export function selectStoreList(data) {
     headers: {'Content-Type': 'application/json',
     }
   })
+}
+// 添加占比
+export function save(data) {
+  return request({
+    url: '/dbCenter/proportion/save ',
+    data: data,
+    method: 'post',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
 }

yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/views/inquireStatistics/index.vue

@@ -82,19 +82,22 @@
           </el-table-column>
           <el-table-column prop="storeName" label="门店" align="center" width="150px">
           </el-table-column>
-          <el-table-column prop="dataDate" label="日期" sortable align="center" width="100px">
+          <el-table-column prop="dataDate" label="日期" sortable align="center" >
           </el-table-column>
-          <el-table-column prop="salesAmount" label="销售额" align="center" width="100px">
+          <el-table-column prop="salesAmount" label="销售额" align="center" >
           </el-table-column>
-          <el-table-column prop="oils" label="油类成本" align="center" width="150px" :formatter="to2">
-          </el-table-column>
-          <el-table-column prop="rice" label="米类成本" align="center" width="150px" :formatter="to2">
-          </el-table-column>
-          <el-table-column prop="face" label="面类成本" align="center" width="150px" :formatter="to2">
+          <el-table-column prop="proportion" label="成本信息" align="center"  :formatter="to2">
+            <template slot-scope="scope">
+              <div slot="reference"  class="name-wrapper" v-for="(item,index) in scope.row.proportion" :key="index">
+              <div slot="reference"  v-for="(item,index) in item" :key="index">
+                {{ item }}
+            </div>
+          </div>
+          </template>
           </el-table-column>
           <el-table-column prop="totalCount" label="合计成本金额" align="center" width="150px" :formatter="to2">
           </el-table-column>
-          <el-table-column fixed="right" width="200px" label="明细信息" align="center">
+          <el-table-column  label="明细信息" align="center">
             <template slot-scope="scope">
               <el-button
                 type="primary"
@@ -312,6 +315,7 @@ export default {
         if (res.success) {
           this.queryParams.total = res.data.total
           _this.tableData=res.data.records
+          console.log(res.data.records[0].proportion[0]);
         } else {
           // 根据resp.code进行异常情况处理
           _this.tableData = []

yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/views/parameterSet/footSet.vue

@@ -1,64 +1,110 @@
 <template>
   <div class="app-container">
       <div class="listconadd" style="padding: 20px;">
-        <table class="e-table" >
-          <tr>
-              <td>品牌</td>
+        <el-table v-loading="tableLoading" :default-sort = "{prop: 'date', order: 'descending'}" :data="tableData" border style="width: 100%" >
+          <el-table-column label="序号" width="55px"  type="index" align="center"></el-table-column>
+          <el-table-column prop="enpName" label="厂家"  align="center">
+          </el-table-column>
+          <el-table-column prop="name" label="品牌" align="center" >
+          </el-table-column>
+          <el-table-column prop="enpName" label="厂家"  align="center">
+          </el-table-column>
+          <el-table-column fixed="right" width="200px" label="明细信息" align="center">
+            <template slot-scope="scope">
+              <el-button
+                type="primary"
+                size="mini"
+                @click="purchase(scope.row)"
+              >
+                修改
+              </el-button>
+              <el-button
+                type="primary"
+                size="mini"
+                @click="addList(scope.row)"
+              >
+                添加
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 添加食品占比 -->
+      <el-dialog
+          :title="dialogTitle + '食品占比'"
+          :visible.sync="editDialog"
+          width="40%"
+        >
+        <table class="e-table" cellspacing="0">
+            <tr>
+              <td>品牌名称</td>
               <td>
-                <el-select v-model="tableData.brandName" placeholder="请选择">
-                  <el-option
-                    v-for="{item,i} in ListName"
-                    :key="i"
-                    :label="item.name"
-                    :value="item.name"
-                  >
-                  </el-option>
-                </el-select>
+                <el-input
+                 v-model="makeUp.brandName"
+                  style="width: 300px"
+                  disabled
+                ></el-input>
               </td>
             </tr>
             <tr>
-              <td>教师姓名</td>
+              <td>占比名称</td>
               <td>
                 <el-input
+                v-model="makeUp.typeName"
                   style="width: 300px"
                 ></el-input>
               </td>
             </tr>
             <tr>
-              <td>教师工号</td>
+              <td>占比百分比</td>
               <td>
                 <el-input
+                v-model="makeUp.proportion"
                   style="width: 300px"
                 ></el-input>
               </td>
             </tr>
           </table>
-      </div>
+          <div style="margin-top: 20px; text-align: center">
+            <el-button type="primary" @click="save()">添加</el-button>
+          </div>
+        </el-dialog>
 </div>
 </template>
   
   <script>
-import {listPage,selectBrandList} from '@/api/Zhj/inquireStatistics/index.js'
+import {selectBrandList,save} from '@/api/Zhj/inquireStatistics/index.js'
 export default {
   data() {
     return {
       tableLoading: false,
-      tableData: {
-        sid:'',
+      dialogTitle: "",
+      tableData: [],
+      editDialog:false,
+      makeUp:{
+        brandSid:'',
         brandName:'',
         typeName:'',
-        proportion:''
+        proportion:'',
       },
-      ListName:[]
+      ruleForm: {
+          time: '',
+          data:{
+          salesAmount:'',
+          purchase:'',
+          salesDishes:''
+          }
+        },
     };
   },
   mounted() {
     selectBrandList().then((res)=>{
       this.ListName = res.data
+      this.tableData=res.data
     })
   },
   created() {
-    
+    this.getPageList()
   },
   methods: {
     resetSearch() {
@@ -74,14 +120,38 @@ export default {
           endTime: "",
         },
       };
+      this.getPageList();
+    },
+    getPageList() {
+
+    },
+    save(){
+      save(this.makeUp).then((res)=>{
+
+      })
     },
+    addList(row){
+      this.dialogTitle = "销售";
+      this.editDialog = true;
+      console.log(row);
+      this.makeUp.brandName = row.name
+      this.makeUp.brandSid = row.sid
+    },
+    resetForm() {
+      this.ruleForm= {
+          time: '',
+          data:{
+          salesAmount:'',
+          purchase:'',
+          salesDishes:''
+          }
+        }
+    }
   },
 };
 </script>
   
   <style scoped="scoped" >
-.my-tabs {
-  margin-top: 10px;
-}
+  
 </style>