物料管理

src/api/basic_data/material.js

@@ -36,3 +36,143 @@ export function getMachineLlist(params) {
 }
 
 
+export function getMachineEdit(params) {
+  return request({
+    url: '/machine-record/edit',
+    method: 'post',
+    data:params
+  })
+}
+
+export function getMachineDel(params) {
+  return request({
+    url: '/machine-record/del',
+    method: 'post',
+    data:params
+  })
+}
+
+
+export function getMachineAdd(params) {
+  return request({
+    url:'/machine-record/add',
+    method: 'post',
+    data:params
+  })
+}
+
+// 产品对应关系
+
+export function getProductAdd(params) {
+  return request({
+    url:'/product-compose/add',
+    method: 'post',
+    data:params
+  })
+}
+
+export function getProductDel(params) {
+  return request({
+    url:'/product-compose/del',
+    method: 'post',
+    params
+  })
+}
+
+export function getProductDetail(params) {
+  return request({
+    url:'/product-compose/detail',
+    method: 'get',
+    params
+  })
+}
+
+export function getProductEdit(params) {
+  return request({
+    url:'/product-compose/edit',
+    method: 'post',
+    data:params
+  })
+}
+
+//  /product-compose/export
+
+
+export function getProductList(params) {
+  return request({
+    url:'/product-compose/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 产品调价单管理
+
+export function getProductRriceAdd(params) {
+  return request({
+    url:'/product-upd-price/add',
+    method: 'post',
+    data:params
+  })
+}
+
+export function getProductRriceConfirm(params) {
+  return request({
+    url:'/product-upd-price/confirm',
+    method: 'post',
+    data:params
+  })
+}
+
+
+export function getProductRriceDetail(params) {
+  return request({
+    url:'/product-upd-price/detail',
+    method: 'get',
+    params
+  })
+}
+
+export function getProductRriceEdit(params) {
+  return request({
+    url:'/product-upd-price/edit',
+    method: 'post',
+    data:params
+  })
+}
+
+export function getProductRriceList(params) {
+  return request({
+    url:'/product-upd-price/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getProductRriceRevoke(params) {
+  return request({
+    url:'/product-upd-price/revoke',
+    method: 'get',
+    params
+  })
+}
+
+
+export function getProductRriceSubmit(params) {
+  return request({
+    url:'/product-upd-price/submit',
+    method: 'get',
+    params
+  })
+}
+
+
+// 产品价格列表
+export function getProductPriceList(params) {
+  return request({
+    url:'/product-price/list',
+    method: 'get',
+    params
+  })
+}

src/api/common.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 获取列表
+// 字典列表
 export function getDictList(params) {
   return request({
     url: '/common/dict/list',
@@ -8,3 +8,12 @@ export function getDictList(params) {
     params
   })
 }
+
+// 销售列表
+export function getTypeList() {
+  return request({
+    url: '/sale/type/list',
+    method: 'get',
+    params
+  })
+}

src/mixin/index.js

@@ -40,6 +40,7 @@ export default {
     hanlePrint() {
       window.print()
     },
+
     // 筛选全部数据
     hanleSelectAll(selection) {
       this.ids = selection.map((k) => {

src/views/basic_data/logistics/logistics_list.vue

@@ -78,7 +78,7 @@
           v-loading="listLoading"
           :data="dataList"
           element-loading-text="Loading"
-          @select="hanleSelect"
+          @select="hanleSelectAll"
           @select-all="hanleSelectAll"
           border
           fit
@@ -165,12 +165,12 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-button
+              <!-- <el-button
                 type="text"
                 class="textColor"
                 @click="hanleDetail(scope.row)"
                 >详情</el-button
-              >
+              > -->
               <el-button
                 type="text"
                 class="textColor"
@@ -351,12 +351,7 @@ export default {
       };
       downloadFiles("/logistics/export", screenData);
     },
-    // 筛选部分数据或者单个
-    hanleSelect(selection) {
-      this.ids = selection.map((k) => {
-        return k.id;
-      });
-    },
+
     // 删除数据
     hanleDelete(id) {
       this.hanleDeleteAllPromise(id).then((ids) => {

src/views/basic_data/material/category_list.vue

@@ -3,7 +3,7 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <div>
-        <el-form label-width="70px" size="small" label-position="left">
+        <!-- <el-form label-width="70px" size="small" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="关键字" prop="account">
@@ -22,7 +22,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
+        </el-form> -->
       </div>
       <div class="mymain-container">
         <div class="table">
@@ -43,23 +43,36 @@
             <el-table-column
               align="center"
               label="编码"
-              prop="code"
+              prop="dictCode"
               min-width="100"
             ></el-table-column>
             <el-table-column
               align="center"
-              label="创建组织"
-              prop="createOrganize"
+              label="类型"
+              prop="dictType"
               min-width="100"
             ></el-table-column>
             <el-table-column
               align="center"
               label="名称"
-              prop="name"
+              prop="dictValue"
               min-width="100"
             ></el-table-column>
+
             <el-table-column
               align="center"
+              label="备注"
+              prop="remark"
+              min-width="100"
+            ></el-table-column>
+             <el-table-column
+              align="center"
+              label="更新时间"
+              prop="createTime"
+              min-width="100"
+            ></el-table-column>
+            <!-- <el-table-column
+              align="center"
               label="使用组织"
               prop="useOrganize"
               min-width="100"
@@ -93,8 +106,8 @@
               label="修改人"
               prop="modify"
               min-width="100"
-            ></el-table-column>
-            <el-table-column
+            ></el-table-column> -->
+            <!-- <el-table-column
               align="center"
               label="修改日期"
               prop="modifyDate"
@@ -134,19 +147,19 @@
                 >编辑</el-button
               >
               <el-button type="text" class="textColor">删除</el-button>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination
+          <!-- <el-pagination
             :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"
           >
-          </el-pagination>
+          </el-pagination> -->
         </div>
       </div>
     </div>
@@ -156,7 +169,12 @@
 
 <script>
 import CategoryListDetail from "./components/category_list-detail.vue";
+import {
+ getDictList
+} from "@/api/common";
+import Mixin from "@/mixin/index";
 export default {
+   mixins: [Mixin],
   data() {
     return {
       isShow: true,
@@ -238,9 +256,23 @@ export default {
     editFn() {
       this.isShow = false;
     },
+      // 初始化数据
+    getList() {
+      this.listLoading = true;
+      let params = {
+       sysDictEnum:'PRODUCT_TYPE'
+
+      };
+      getDictList(params).then((res) => {
+        this.dataList = res.data;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+        // console.log(this.dataList, 1233);
+      });
+    },
   },
 };
 </script>
 
 <style>
-</style>
+</style>

src/views/basic_data/material/components/material_list-detail.vue

@@ -13,7 +13,7 @@
         <el-col :span="8"><span>编码</span><input type="text"  v-model="detail.useOrgNumber"/></el-col>
       </el-row>
       <el-row>
-        <el-col :span="8"><span>名称</span><input type="text" /></el-col>
+        <el-col :span="8"><span>名称</span><input type="text" v-model="detail.useOrgName"/></el-col>
         <el-col :span="8"></el-col>
         <el-col :span="8"></el-col>
       </el-row>
@@ -30,9 +30,12 @@
           <el-row>
             <el-col :span="24"
               ><span class="marg-r">规格型号</span
-              ><select name="" id="" class="selectStyle2">
+              >
+              <input type="text" v-model="detail.specification">
+              <!-- <select name="" id="" class="selectStyle2">
                 <option value="">普通仓库</option>
-              </select></el-col
+              </select> -->
+              </el-col
             >
           </el-row>
           <el-row>
@@ -42,7 +45,7 @@
           </el-row>
           <el-row>
             <el-col :span="24"
-              ><span class="marg-r color">旧物料编码</span><input type="text" />
+              ><span class="marg-r color">旧物料编码</span><input type="text" v-model="detail.number"/>
             </el-col>
           </el-row>
           <el-row>
@@ -158,7 +161,7 @@
           </el-row>
           <el-row>
             <el-col :span="24"
-              ><span class="marg-r">存货类别</span><input type="text"
+              ><span class="marg-r">存货类别</span><input type="text" v-model="detail.categoryId"
             /></el-col>
           </el-row>
           <el-row>
@@ -208,22 +211,22 @@
           </div>
           <el-row>
             <el-col :span="24"
-              ><span class="marg-r">长</span><input type="text"
+              ><span class="marg-r">长</span><input type="text" v-model="detail.length"
             /></el-col>
           </el-row>
           <el-row>
             <el-col :span="24"
-              ><span class="marg-r">宽</span><input type="text"
+              ><span class="marg-r">宽</span><input type="text" v-model="detail.width"
             /></el-col>
           </el-row>
           <el-row>
             <el-col :span="24"
-              ><span class="marg-r">高</span><input type="text"
+              ><span class="marg-r">高</span><input type="text" v-model="detail.height"
             /></el-col>
           </el-row>
           <el-row>
             <el-col :span="24"
-              ><span class="marg-r">体积</span><input type="text"
+              ><span class="marg-r">体积</span><input type="text"  v-dmole="detail.volume"
             /></el-col>
           </el-row>
           <el-row>

src/views/basic_data/material/components/modify_list-approval.vue

@@ -6,11 +6,17 @@
     <br />
     <br />
     <div>
-      <el-form label-width="100px" size="small" label-position="left">
+      <el-form
+        ref="screenForm"
+        :model="detail"
+        label-width="70px"
+        size="small"
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据编号" prop="account">
-              <el-input placeholder="请输入"></el-input>
+            <el-form-item label="单据编号" prop="billId">
+              <el-input placeholder="请输入" v-model="detail.billId"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -29,8 +35,11 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价业务员" prop="account">
-              <el-input placeholder="请输入"></el-input>
+            <el-form-item label="调价业务员" prop="operatorName">
+              <el-input
+                placeholder="请输入"
+                v-model="detail.operatorName"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -52,165 +61,188 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="文件编码" prop="account">
-              <el-input placeholder="请输入"></el-input>
+            <el-form-item label="文件编码" prop="operatorName">
+              <el-input
+                placeholder="请输入"
+                v-model="detail.operatorName"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-    </div>
-    <div class="mymain-container">
-      <!-- 列表 -->
-      <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column
-            align="center"
-            label="销售类型"
-            prop="SalesType"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="存货编码"
-            prop="code"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="存货名称"
-            prop="name"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="规格型号"
-            prop="model"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="计量单位"
-            prop="company"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="批发价"
-            prop="wholesale"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="零售价"
-            prop="retail"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="返利使用比例"
-            prop="rebate"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="生效日期"
-            prop="effectiveDate"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="失效日期"
-            prop="expiryDate"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="是否促销价"
-            prop="promotion"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="数量"
-            prop="number"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="发布"
-            prop="release"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
 
-    <el-row>
-      <el-col :xs="24" :sm="24" :lg="24">
-        <h3>审批</h3>
-        <hr />
-      </el-col>
-    </el-row>
-    <div class="diy-table-1">
-      <el-row :gutter="0">
-        <el-col :xs="12" :sm="12" :lg="12" class="item">
-          <div class="label">审批人</div>
-          <div class="value">2022123233435342</div>
-        </el-col>
-        <el-col :xs="12" :sm="12" :lg="12" class="item">
-          <div class="label">审批结果</div>
-          <div class="value">
-            <el-radio v-model="radio" label="1">通过</el-radio>
-            <el-radio v-model="radio" label="2">驳回</el-radio>
+        <div class="mymain-container">
+          <!-- 列表 -->
+          <div class="table">
+            <el-table
+              :data="detail.items"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+            >
+              <el-table-column
+                align="center"
+                label="销售类型"
+                prop="saleTypeId"
+                min-width="160"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                label="存货编码"
+                prop="billId"
+                min-width="160"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                label="存货名称"
+                prop="materialName"
+                min-width="160"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                label="规格型号"
+                prop="model"
+                min-width="160"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                label="计量单位"
+                prop="company"
+                min-width="160"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                label="批发价"
+                prop="batchPrice"
+                min-width="160"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                label="零售价"
+                prop="retailPrice"
+                min-width="160"
+                show-overflow-tooltip
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                label="返利使用比例"
+                prop="rebateUseRate"
+                min-width="160"
+                show-overflow-tooltip
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                label="生效日期"
+                prop="startDate"
+                min-width="160"
+                show-overflow-tooltip
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                label="失效日期"
+                prop="endDate"
+                min-width="160"
+                show-overflow-tooltip
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                label="是否促销价"
+                prop="isPromote"
+                min-width="160"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <el-tag type="success" v-if="scope.row.isPromote">是</el-tag>
+                  <el-tag type="danger" v-else>否</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="center"
+                label="数量"
+                prop="qty"
+                min-width="160"
+                show-overflow-tooltip
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                label="发布"
+                prop="isPublish"
+                min-width="160"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <el-tag type="success" v-if="scope.row.isPublish">是</el-tag>
+                  <el-tag type="danger" v-else>否</el-tag>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
-        </el-col>
+        </div>
+        <el-row>
+          <el-col :xs="24" :sm="24" :lg="24">
+            <h3>审批</h3>
+            <hr />
+          </el-col>
+        </el-row>
+        <div class="diy-table-1">
+          <el-row :gutter="0">
+            <el-col :xs="12" :sm="12" :lg="12" class="item">
+              <div class="label">审批人</div>
+              <div class="value">2022123233435342</div>
+            </el-col>
+            <el-col :xs="12" :sm="12" :lg="12" class="item">
+              <div class="label">审批结果</div>
+              <div class="value">
+                <el-radio v-model="radio" label="0">通过</el-radio>
+                <el-radio v-model="radio" label="1">驳回</el-radio>
+              </div>
+            </el-col>
 
-        <el-col :xs="24" :sm="24" :lg="24" class="item">
-          <div class="label">审批说明</div>
-          <div class="value">2022123233435342</div>
-        </el-col>
-      </el-row>
-    </div>
-    <br />
-    <div class="btn-group clearfix">
-      <div class="fl">
-        <el-button type="primary" size="small">提交审批</el-button>
-        <el-button type="primary" size="small">重置</el-button>
-      </div>
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
+              <div class="label">审批说明</div>
+              <div class="value">2022123233435342</div>
+            </el-col>
+          </el-row>
+        </div>
+        <br />
+        <div class="btn-group clearfix">
+          <div class="fl">
+            <el-button type="primary" size="small" @click="onSubmit"
+              >提交审批</el-button
+            >
+            <el-button type="primary" size="small" @click="resetScreenForm"
+              >重置</el-button
+            >
+          </div>
+        </div>
+      </el-form>
     </div>
   </div>
 </template>
 
 <script>
+import { getProductRriceConfirm } from "@/api/basic_data/material";
+import Mixin from "@/mixin/index";
 export default {
+  // mixins: [Mixin],
+  props: {
+    detail: {
+      type: Object,
+      default: {},
+    },
+  },
   data() {
     return {
       radio: "",
@@ -238,6 +270,18 @@ export default {
       console.log(this.$parent);
       this.$parent.show = 1;
     },
+    onSubmit() {
+      const params = {
+        ...this.detail,
+        // confirmResult:this.radio
+      };
+      getProductRriceConfirm(params).then((res) => {
+        console.log(res);
+      });
+    },
+    resetScreenForm() {
+      this.detail = {};
+    },
   },
 };
 </script>
@@ -249,4 +293,4 @@ export default {
 ::v-deep .el-select {
   width: 100%;
 }
-</style>
+</style>

src/views/basic_data/material/components/modify_list-detail.vue

@@ -10,7 +10,7 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据编号" prop="account">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder="请输入" v-model="detail.billId"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -30,7 +30,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="调价业务员" prop="account">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder="请输入" v-model="detail.operatorName"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -53,7 +53,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="文件编码" prop="account">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder="请输入" v-model="detail.operatorName"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -63,8 +63,8 @@
       <!-- 列表 -->
       <div class="table">
         <el-table
-          v-loading="listLoading"
-          :data="dataList"
+
+          :data="detail.items"
           element-loading-text="Loading"
           border
           fit
@@ -74,21 +74,21 @@
           <el-table-column
             align="center"
             label="销售类型"
-            prop="SalesType"
+            prop="saleTypeId"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货编码"
-            prop="code"
+            prop="billId"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货名称"
-            prop="name"
+            prop="materialName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -109,14 +109,14 @@
           <el-table-column
             align="center"
             label="批发价"
-            prop="wholesale"
+            prop="batchPrice"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="零售价"
-            prop="retail"
+            prop="retailPrice"
             min-width="160"
             show-overflow-tooltip
           >
@@ -124,7 +124,7 @@
           <el-table-column
             align="center"
             label="返利使用比例"
-            prop="rebate"
+            prop="rebateUseRate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -132,7 +132,7 @@
           <el-table-column
             align="center"
             label="生效日期"
-            prop="effectiveDate"
+            prop="startDate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -140,7 +140,7 @@
           <el-table-column
             align="center"
             label="失效日期"
-            prop="expiryDate"
+            prop="endDate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -148,15 +148,19 @@
           <el-table-column
             align="center"
             label="是否促销价"
-            prop="promotion"
+            prop="isPromote"
             min-width="160"
             show-overflow-tooltip
           >
+                     <template slot-scope="scope">
+               <el-tag type="success" v-if="scope.row.isPromote">是</el-tag>
+                 <el-tag type="danger" v-else>否</el-tag>
+              </template>
           </el-table-column>
           <el-table-column
             align="center"
             label="数量"
-            prop="number"
+            prop="qty"
             min-width="160"
             show-overflow-tooltip
           >
@@ -164,10 +168,14 @@
           <el-table-column
             align="center"
             label="发布"
-            prop="release"
+            prop="isPublish"
             min-width="160"
             show-overflow-tooltip
           >
+                  <template slot-scope="scope">
+               <el-tag type="success" v-if="scope.row.isPublish">是</el-tag>
+                 <el-tag type="danger" v-else>否</el-tag>
+              </template>
           </el-table-column>
         </el-table>
       </div>
@@ -198,6 +206,12 @@
 
 <script>
 export default {
+  props:{
+    detail:{
+      type:Object,
+      default:{}
+    }
+  },
   data() {
     return {
       dataList: [
@@ -235,4 +249,4 @@ export default {
 ::v-deep .el-select {
   width: 100%;
 }
-</style>
+</style>

src/views/basic_data/material/machine_list.vue

@@ -22,7 +22,7 @@
             <el-form-item label="型号" prop="type">
               <el-input
                 placeholder="请输入型号"
-                v-model="screenForm.name"
+                v-model="screenForm.type"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -57,13 +57,41 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small">新增</el-button>
-        <el-button type="primary" size="small">编辑</el-button>
-        <el-button type="primary" size="small">删除</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          @click="(showDialogForm = true), (type = 1)"
+          >新增</el-button
+        >
+       <el-popconfirm
+                confirm-button-text="好的"
+                cancel-button-text="不用了"
+                icon="el-icon-info"
+                icon-color="red"
+                title="内容确定删除吗？"
+                @onConfirm="hanleDeleteAll"
+              >
+                <el-button
+                  slot="reference"
+                   type="primary"
+      size="small"
+                  class="textColor el-popover-left"
+                  >删除</el-button
+                >
+              </el-popconfirm>
       </div>
       <div class="fr">
-        <el-button type="primary" size="small">导入</el-button>
-        <el-button type="primary" size="small">导出</el-button>
+        <el-upload
+          class="import-btn"
+          :action="baseURL + 'student/import'"
+          :http-request="handleImport"
+          :file-list="importFileList"
+        >
+          <el-button type="primary" size="small">导入</el-button>
+        </el-upload>
+        <el-button type="primary" size="small" @click="handleExport"
+          >导出</el-button
+        >
         <el-button type="primary" size="small">打印</el-button>
       </div>
     </div>
@@ -77,6 +105,8 @@
           border
           fit
           highlight-current-row
+           @select-all="hanleSelectAll"
+           @select="hanleSelectAll"
           stripe
         >
           <el-table-column type="selection" align="center"></el-table-column>
@@ -185,10 +215,30 @@
             min-width="160"
             show-overflow-tooltip
           >
-            <el-button type="text" class="textColor" @click="editFn"
-              >编辑</el-button
-            >
-            <el-button type="text" class="textColor">删除</el-button>
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                class="textColor"
+                @click="editFn(scope.row.id,scope.row)"
+                >编辑</el-button
+              >
+                 <el-popconfirm
+                confirm-button-text="好的"
+                cancel-button-text="不用了"
+                icon="el-icon-info"
+                icon-color="red"
+                title="内容确定删除吗？"
+                @onConfirm="hanleDeleteAll(scope.row.id)"
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+
+                  class="textColor el-popover-left"
+                  >删除</el-button
+                >
+              </el-popconfirm>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -206,7 +256,6 @@
         </el-pagination>
       </div>
     </div>
-
     <!-- 弹窗 -->
     <el-dialog
       title="产品信息"
@@ -215,9 +264,15 @@
       :show-close="false"
       :close-on-click-modal="false"
     >
-      <el-form ref="form" :model="diaLogForm" label-width="100px">
+      <el-form
+        ref="diaLogForm"
+        :model="diaLogForm"
+        label-width="70px"
+        size="small"
+        label-position="left"
+      >
         <el-form-item label="内机名称">
-          <el-select
+          <!-- <el-select
             v-model="diaLogForm.positionName"
             multiple
             placeholder="请选择"
@@ -229,19 +284,20 @@
               :value="item.value"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
+          <el-input v-model="diaLogForm.innerMachineName"></el-input>
         </el-form-item>
         <el-form-item label="内机型号">
-          <el-input v-model="diaLogForm.storeName"></el-input>
+          <el-input v-model="diaLogForm.innerMachineType"></el-input>
         </el-form-item>
         <el-form-item label="内机编码">
-          <el-input v-model="diaLogForm.storeName"></el-input>
+          <el-input v-model="diaLogForm.innerMachineNumber"></el-input>
         </el-form-item>
         <el-form-item label="内机体积">
-          <el-input v-model="diaLogForm.storeName"></el-input>
+          <el-input v-model="diaLogForm.innerMachineVolume"></el-input>
         </el-form-item>
         <el-form-item label="外机名称">
-          <el-select
+          <!-- <el-select
             v-model="diaLogForm.positionName"
             multiple
             placeholder="请选择"
@@ -253,29 +309,30 @@
               :value="item.value"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
+          <el-input v-model="diaLogForm.outsideMachineName"></el-input>
         </el-form-item>
         <el-form-item label="外机机型号">
-          <el-input v-model="diaLogForm.storeName"></el-input>
+          <el-input v-model="diaLogForm.outsideMachineType"></el-input>
         </el-form-item>
         <el-form-item label="外机编码">
-          <el-input v-model="diaLogForm.storeName"></el-input>
+          <el-input v-model="diaLogForm.outsideMachineNumber"></el-input>
         </el-form-item>
         <el-form-item label="外机体积">
-          <el-input v-model="diaLogForm.storeName"></el-input>
+          <el-input v-model="diaLogForm.outsideMachineVolume"></el-input>
         </el-form-item>
-        <el-form-item label="配件1">
+        <!-- <el-form-item label="配件1">
           <el-input v-model="diaLogForm.alert"></el-input>
         </el-form-item>
         <el-form-item label="配件2">
           <el-input v-model="diaLogForm.alert"></el-input>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="showDialogForm = false">取 消</el-button>
-        <el-button type="primary" @click="showDialogForm = false"
-          >确 定</el-button
+        <el-button @click="(showDialogForm = false), resetInfo()"
+          >取 消</el-button
         >
+        <el-button type="primary" @click="hanleInfo">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -283,7 +340,13 @@
 
 <script>
 import Mixin from "@/mixin/index";
-import { getMachineLlist } from "@/api/basic_data/material";
+import { downloadFiles, handleImport } from "@/utils/util";
+import {
+  getMachineLlist,
+  getMachineAdd,
+  getMachineDel,
+  getMachineEdit,
+} from "@/api/basic_data/material";
 export default {
   mixins: [Mixin],
   data() {
@@ -314,10 +377,16 @@ export default {
         },
       ],
       diaLogForm: {
-        storeName: "",
-        positionName: [],
-        alert: "",
-        text: "",
+        id: null,
+        innerMachineName: "",
+        innerMachineNumber: "",
+        innerMachineType: "",
+        innerMachineVolume: 2,
+        orgNumber: "",
+        outsideMachineName: "",
+        outsideMachineNumber: "",
+        outsideMachineType: "",
+        outsideMachineVolume: 2,
       },
       showDialogForm: false,
       dataList: [
@@ -408,12 +477,46 @@ export default {
         type: "",
         volume: "",
       },
+      type: null,
     };
   },
   methods: {
-    editFn() {
+    editFn(id, row) {
+      this.type=2
+      this.diaLogForm = {
+        id,
+        innerMachineName: row.innerMachineName,
+        innerMachineNumber: row.innerMachineNumber,
+        innerMachineType: row.innerMachineType,
+        innerMachineVolume: row.innerMachineVolume,
+        orgNumber: row.orgNumber,
+        outsideMachineName: row.outsideMachineName,
+        outsideMachineNumber: row.outsideMachineNumber,
+        outsideMachineType: row.outsideMachineType,
+        outsideMachineVolume: row.outsideMachineVolume,
+      };
       this.showDialogForm = true;
     },
+    hanleInfo() {
+      if (this.type === 1) {
+        getMachineAdd(this.diaLogForm).then((res) => {
+          this.$successMsg("保存成功");
+          this.getList();
+        });
+      } else if (this.type === 2) {
+        const params = {
+          ...this.diaLogForm,
+        };
+        getMachineEdit(params).then((res) => {
+          this.$successMsg("编辑成功");
+          this.getList();
+        });
+        this.diaLogForm.id = null;
+      }
+      this.resetInfo();
+      this.showDialogForm = false;
+
+    },
     // 初始化数据
     getList() {
       this.listLoading = true;
@@ -432,6 +535,57 @@ export default {
         console.log(this.dataList, 1233);
       });
     },
+    // 导入
+    async handleImport(param) {
+      this.importLoading = true;
+      const file = param.file;
+      console.log(file, 123);
+      const formData = new FormData();
+      formData.append("file", file);
+      let result = await handleImport("/stock/importToll", formData);
+      this.importLoading = false;
+      this.importFileList = [];
+      if (result.code == 200) {
+        this.$alert(result.message, "导入成功", {
+          confirmButtonText: "确定",
+        });
+        this.getList();
+      } else {
+        this.$alert(result.message, "导入失败", {
+          confirmButtonText: "确定",
+        });
+      }
+    },
+    handleExport() {
+      let screenData = {
+        customerName: this.screenForm.customerName,
+        freeDay: this.screenForm.freeDay,
+        toll: this.screenForm.toll,
+      };
+      downloadFiles("/machine-record/export", screenData);
+    },
+    hanleDeleteAll(id) {
+      console.log(id);
+      this.hanleDeleteAllPromise(id).then((ids) => {
+        getMachineDel(ids).then((res) => {
+           this.getList();
+        });
+      });
+    },
+    resetInfo() {
+      this.diaLogForm = {
+        id: null,
+        innerMachineName: "",
+        innerMachineNumber: "",
+        innerMachineType: "",
+        innerMachineVolume: 2,
+        orgNumber: "4564",
+        outsideMachineName: "",
+        outsideMachineNumber: "",
+        outsideMachineType: "",
+        outsideMachineVolume: 2,
+      };
+    },
   },
 };
 </script>

src/views/basic_data/material/material_list.vue

@@ -52,7 +52,7 @@
             <el-table-column
               align="center"
               label="使用组织"
-              prop="useOrgId"
+              prop="useOrgName"
               min-width="100"
             ></el-table-column>
             <el-table-column
@@ -102,7 +102,7 @@
             <el-table-column
               align="center"
               label="基本单位"
-              prop="baseCompany"
+              prop="baseUnitId"
               min-width="100"
             ></el-table-column>
             <el-table-column
@@ -122,7 +122,7 @@
               <el-button type="text" class="textColor" @click="hanleDetail(scope.row.id)"
                 >详情</el-button
               >
-              <el-button type="text" class="textColor">删除</el-button>
+              <!-- <el-button type="text" class="textColor">删除</el-button> -->
               </template>
             </el-table-column>
           </el-table>
@@ -130,7 +130,9 @@
         <!-- 分页 -->
         <div class="fr">
           <el-pagination
-            :current-page="currentPage"
+            @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
@@ -162,7 +164,6 @@ export default {
   components: { MaterialListDetail },
   methods: {
     hanleDetail(id) {
-
       getMaterialDetail({id}).then((res)=>{
             console.log(res);
             this.detail = res.data

src/views/basic_data/material/modify_list.vue

@@ -3,26 +3,30 @@
     <div v-if="show === 1">
       <!-- 筛选条件 -->
       <div>
-        <el-form label-width="70px" size="small" label-position="left">
+        <el-form     ref="screenForm"
+        :model="screenForm"
+        label-width="70px"
+        size="small"
+        label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="存货编码" prop="account">
-                <el-input placeholder="请输入存货编码"></el-input>
+              <el-form-item label="存货编码" prop="materialNumber">
+                <el-input placeholder="请输入存货编码" v-model="screenForm.materialNumber"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="存货名称" prop="nickname">
-                <el-input placeholder="请输入存货名称"></el-input>
+              <el-form-item label="存货名称" prop="materialName">
+                <el-input placeholder="请输入存货名称" v-model="screenForm.materialName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="存货代码" prop="account">
-                <el-input placeholder="请输入存货代码"></el-input>
+                <el-input placeholder="请输入存货代码" v-model="screenForm.account"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="生效日期" prop="nickname">
-                <el-input placeholder="请输入生效日期"></el-input>
+              <el-form-item label="生效日期" prop="startDate">
+                <el-input placeholder="请输入生效日期"  v-model="screenForm.startDate"></el-input>
               </el-form-item>
             </el-col>
 
@@ -68,7 +72,7 @@
             <el-table-column
               align="center"
               label="单据号"
-              prop="billNnmber"
+              prop="billId"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -82,7 +86,7 @@
             <el-table-column
               align="center"
               label="销售类型"
-              prop="saleType"
+              prop="saleTypeId"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -96,14 +100,14 @@
             <el-table-column
               align="center"
               label="存货编码"
-              prop="code"
+              prop="billId"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="存货名称"
-              prop="name"
+              prop="materialName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -124,14 +128,14 @@
             <el-table-column
               align="center"
               label="数量"
-              prop="number"
+              prop="qty"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="批发价"
-              prop="wholesale"
+              prop="batchPrice"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -146,24 +150,29 @@
             <el-table-column
               align="center"
               label="生效日期"
-              prop="effectiveDate"
+              prop="startDate"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="失效日期"
-              prop="expiryDate"
+              prop="endDate"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="是否促销价"
-              prop="promotion"
+              prop="isPromote"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+               <el-tag type="success" v-if="scope.row.isPromote">是</el-tag>
+                 <el-tag type="danger" v-else>否</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="调价部门"
@@ -174,7 +183,7 @@
             <el-table-column
               align="center"
               label="调价业务员"
-              prop="modifyPriceSalesman"
+              prop="operatorName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -188,42 +197,53 @@
             <el-table-column
               align="center"
               label="审核人"
-              prop="examineUser"
+              prop="confirmBy"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="审核日期"
-              prop="examineDate"
+              prop="confirmTime"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="状态"
-              prop="state"
+              prop="billFlag"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+               <template slot-scope="scope">
+               <el-tag type="success" v-if="scope.row.billFlag =='A'">保存</el-tag>
+                 <el-tag type="danger" v-else-if="scope.row.billFlag =='B'">提交</el-tag>
+                  <el-tag type="danger" v-else>审核</el-tag>
+              </template>
+
+            </el-table-column>
             <el-table-column
               align="center"
               label="操作"
               min-width="160"
               show-overflow-tooltip
             >
-              <el-button type="text" class="textColor" @click="approvalFn"
+              <template slot-scope="scope">
+                 <el-button type="text" class="textColor" @click="approvalFn(scope.row.id)"
                 >审批</el-button
               >
-              <el-button type="text" class="textColor" @click="detailFn"
+              <el-button type="text" class="textColor" @click="detailFn(scope.row.id)"
                 >详情</el-button
               >
+              </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- 分页 -->
         <div class="fr">
           <el-pagination
+              @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
@@ -235,19 +255,28 @@
       </div>
     </div>
     <ModifyListApply v-else-if="show === 2" />
-    <ModifyListApproval v-else-if="show === 3" />
-    <ModifyListDetail v-else />
+    <ModifyListApproval v-else-if="show === 3" :detail="detail"/>
+    <ModifyListDetail v-else :detail="detail" />
   </div>
 </template>
 
 <script>
+
 import ModifyListApply from "./components/modify_list-apply.vue";
 import ModifyListApproval from "./components/modify_list-approval.vue";
 import ModifyListDetail from "./components/modify_list-detail.vue";
+import Mixin from "@/mixin/index";
+import {
+ getProductRriceAdd,getProductRriceConfirm,getProductRriceDetail,
+ getProductRriceEdit,getProductRriceList,getProductRriceRevoke,
+ getProductRriceSubmit
+} from "@/api/basic_data/material";
+import { downloadFiles } from "@/utils/util";
 export default {
+  mixins: [Mixin],
   data() {
     return {
-      show: 1,
+      show: 3,
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
@@ -342,6 +371,13 @@ export default {
           state: "已通过",
         },
       ],
+        searchForm: {
+        materialName: "",
+        materialNumber: "",
+        startDate: "",
+
+      },
+      detail:{}
     };
   },
   components: {
@@ -354,10 +390,94 @@ export default {
       this.show = 2;
     },
     approvalFn() {
-      this.show = 3;
+  getProductRriceDetail({id}).then(res=>{
+        this.detail = res.data
+          this.show = 3;
+      })
+
+    },
+    detailFn(id) {
+      getProductRriceDetail({id}).then(res=>{
+        this.detail = res.data
+        this.show = 4;
+      })
+
+
+    },
+    getList() {
+      this.listLoading = true;
+      let params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        materialName: this.searchForm.materialName,
+        materialNumber: this.searchForm.materialNumber,
+        startDate: this.searchForm.startDate,
+
+      };
+      getProductRriceList(params).then((res) => {
+        this.dataList = res.data.records;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      });
+    },
+    editFn(id, row) {
+      this.diaLogForm = {
+        id,
+        composeNumber: row.composeNumber,
+        items: row.items === undefined ? [] : row.items,
+        materialId: row.materialId,
+        orgNumber: row.orgNumber,
+        productModel: row.productModel,
+        productVolume: row.productVolume,
+      };
+      this.showDialogForm = true;
+    },
+    hanleInfo() {
+      if (this.type === 1) {
+        getProductAdd(this.diaLogForm).then((res) => {
+          this.$successMsg("保存成功");
+          console.log(params, 123);
+          this.getList();
+        });
+      } else if (this.type === 2) {
+        const params = {
+          ...this.diaLogForm,
+        };
+        console.log(params, 123);
+        getProductEdit(params).then((res) => {
+          this.$successMsg("编辑成功");
+          this.getList();
+        });
+        this.diaLogForm.id = null;
+      }
+      this.showDialogForm = false;
+    },
+    hanleDelete(id) {
+      this.hanleDeleteAllPromise(id).then((ids) => {
+        getProductDel(ids).then((res) => {
+          this.$successMsg("删除成功");
+        });
+      });
+    },
+        handleExport() {
+      let screenData = {
+        customerName: this.screenForm.customerName,
+        freeDay: this.screenForm.freeDay,
+        toll: this.screenForm.toll,
+      };
+      downloadFiles("/product-compose/export", screenData);
     },
-    detailFn() {
-      this.show = 4;
+    resetInfo() {
+      this.diaLogForm = {
+        id: null,
+        composeNumber: "",
+        id: "",
+        items: [],
+        materialId: "",
+        orgNumber: 0,
+        productModel: "",
+        productVolume: "",
+      };
     },
   },
 };
@@ -367,4 +487,4 @@ export default {
 ::v-deep .el-select--small {
   width: 100%;
 }
-</style>
+</style>

src/views/basic_data/material/price_list.vue

@@ -2,36 +2,40 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form label-width="80px" size="small" label-position="left">
+      <el-form    ref="screenForm"
+        :model="screenForm"
+        label-width="70px"
+        size="small"
+        label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="存货编码" prop="account">
-              <el-input placeholder="请输入存货编码"></el-input>
+              <el-input placeholder="请输入存货编码" v-model="screenForm.materialNumber"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="存货名称" prop="nickname">
-              <el-input placeholder="请输入存货名称"></el-input>
+              <el-input placeholder="请输入存货名称" v-model="screenForm.materialName"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
+          <!-- <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="存货代码" prop="account">
-              <el-input placeholder="请输入存货代码"></el-input>
+              <el-input placeholder="请输入存货代码" v-model="screenForm.materialNumber"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="生效日期" prop="nickname">
-              <el-input placeholder="请输入生效日期"></el-input>
+              <el-input placeholder="请输入生效日期" v-model="screenForm.startDate"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="失效日期" prop="nickname">
-              <el-input placeholder="请输入失效日期"></el-input>
+              <el-input placeholder="请输入失效日期" v-model="screenForm.endDate"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="销售类型" prop="nickname">
-              <el-input placeholder="请输入销售类型"></el-input>
+              <el-input placeholder="请输入销售类型" v-model="screenForm.saleTypeId"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -44,7 +48,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="规格型号" prop="nickname">
-              <el-input placeholder="请输入规格型号"></el-input>
+              <el-input placeholder="请输入规格型号" v-model="screenForm.specification"></el-input>
             </el-form-item>
           </el-col>
 
@@ -82,42 +86,42 @@
           <el-table-column
             align="center"
             label="产品品类"
-            prop="productCategory"
+            prop="categoryId"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货编码"
-            prop="code"
+            prop="categoryNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货名称"
-            prop="name"
+            prop="categoryName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货代码"
-            prop="number"
+            prop="categoryNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="规格型号"
-            prop="specs"
+            prop="specification"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="销售类型"
-            prop="salesType"
+            prop="saleTypeId"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -131,21 +135,21 @@
           <el-table-column
             align="center"
             label="数量下限"
-            prop="lowerLimit"
+            prop="qty"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="返利比例"
-            prop="rebateRatio"
+            prop="rebateUseRate"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="生效日期"
-            prop="effectiveDate"
+            prop="startDate"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -153,7 +157,7 @@
           <el-table-column
             align="center"
             label="失效日期"
-            prop="ExpiryDate"
+            prop="endDate"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -163,25 +167,35 @@
             prop="promotion"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+               <template slot-scope="scope">
+               <el-tag type="success" v-if="scope.row.promotion">是</el-tag>
+                 <el-tag type="danger" v-else>否</el-tag>
+              </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="是否促作废"
-            prop="cancellation"
+            prop="isRevoke"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+               <template slot-scope="scope">
+               <el-tag type="success" v-if="scope.row.isRevoke">是</el-tag>
+                 <el-tag type="danger" v-else>否</el-tag>
+              </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="批发价1"
-            prop="wholesaleOne"
+            prop="batchPrice"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="备注"
-            prop="remarks"
+            prop="remark"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -190,6 +204,9 @@
       <!-- 分页 -->
       <div class="fr">
         <el-pagination
+         @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+
           :current-page="currentPage"
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
@@ -203,7 +220,13 @@
 </template>
 
 <script>
+import Mixin from "@/mixin/index";
+import {
+getProductPriceList
+} from "@/api/basic_data/material";
+import { downloadFiles } from "@/utils/util";
 export default {
+  mixins: [Mixin],
   data() {
     return {
       currentPage: 1, // 当前页码
@@ -280,12 +303,42 @@ export default {
           remarks: "*常规机*",
         },
       ],
+       searchForm: {
+        categoryId:"",
+       endDate:"",
+       materialName:"",
+       materialNumber:"",
+       saleTypeId:"",
+       specification:"",
+       startDate:""
+
+      },
     };
   },
   methods: {
     addFn() {
       this.showDialogForm = true;
     },
+      getList() {
+      this.listLoading = true;
+      let params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        categoryId:this.searchForm.categoryId,
+       endDate:this.searchForm.endDate,
+       materialName:this.searchForm.materialName,
+       materialNumber:this.searchForm.materialNumber,
+       saleTypeId:this.searchForm.saleTypeId,
+       specification:this.searchForm.specification,
+       startDate:this.searchForm.startDate
+
+      };
+      getProductPriceList(params).then((res) => {
+        this.dataList = res.data.records;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      });
+    },
   },
 };
 </script>
@@ -294,4 +347,4 @@ export default {
 ::v-deep .el-select--small {
   width: 100%;
 }
-</style>
+</style>

src/views/basic_data/material/relation_list.vue

@@ -2,56 +2,92 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form label-width="70px" size="small" label-position="left">
+      <el-form
+        ref="screenForm"
+        :model="screenForm"
+        label-width="70px"
+        size="small"
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="account">
-              <el-input placeholder="请输入产品名称"></el-input>
+            <el-form-item label="产品名称" prop="name">
+              <el-input
+                placeholder="请输入产品名称"
+                v-model="screenForm.name"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品型号" prop="nickname">
-              <el-input placeholder="请输入产品型号"></el-input>
+            <el-form-item label="产品型号" prop="type">
+              <el-input
+                placeholder="请输入产品型号"
+                v-model="screenForm.type"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="套机编码" prop="account">
-              <el-input placeholder="请输入套机编码"></el-input>
+            <el-form-item label="套机编码" prop="number">
+              <el-input
+                placeholder="请输入套机编码"
+                v-model="screenForm.number"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品体积" prop="nickname">
-              <el-input placeholder="请输入产品体积"></el-input>
+            <el-form-item label="产品体积" prop="volume">
+              <el-input
+                placeholder="请输入产品体积"
+                v-model="screenForm.volume"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="外机名称" prop="nickname">
-              <el-input placeholder="请输入外机名称"></el-input>
+            <el-form-item label="外机名称" prop="outsideName">
+              <el-input
+                placeholder="请输入外机名称"
+                v-model="screenForm.outsideName"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="外机型号" prop="nickname">
-              <el-input placeholder="请输入外机型号"></el-input>
+              <el-input
+                placeholder="请输入外机型号"
+                v-model="screenForm.outsideType"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="外机编码" prop="nickname">
-              <el-input placeholder="请输入内机编码"></el-input>
+            <el-form-item label="外机编码" prop="outsideNumber">
+              <el-input
+                placeholder="请输入内机编码"
+                v-model="screenForm.outsideNumber"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="内机名称" prop="nickname">
-              <el-input placeholder="请输入内机名称"></el-input>
+            <el-form-item label="内机名称" prop="innerName">
+              <el-input
+                placeholder="请输入内机名称"
+                v-model="screenForm.innerName"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="内机型号" prop="nickname">
-              <el-input placeholder="请输入内机型号"></el-input>
+            <el-form-item label="内机型号" prop="innerType">
+              <el-input
+                placeholder="请输入内机型号"
+                v-model="screenForm.innerType"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="内机编码" prop="nickname">
-              <el-input placeholder="请输入内机编码"></el-input>
+            <el-form-item label="内机编码" prop="innerNumber">
+              <el-input
+                placeholder="请输入内机编码"
+                v-model="screenForm.innerNumber"
+              ></el-input>
             </el-form-item>
           </el-col>
 
@@ -69,14 +105,38 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small">新增</el-button>
-        <el-button type="primary" size="small">编辑</el-button>
-        <el-button type="primary" size="small">删除</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          @click="(showDialogForm = true), (type = 1)"
+          >新增</el-button
+        >
+
+        <el-popconfirm
+          confirm-button-text="好的"
+          cancel-button-text="不用了"
+          icon="el-icon-info"
+          icon-color="red"
+          title="内容确定删除吗？"
+          @onConfirm="hanleDelete"
+        >
+          <el-button
+            type="primary"
+            size="small"
+            slot="reference"
+            class="el-popover-left"
+            >删除</el-button
+          >
+        </el-popconfirm>
       </div>
       <div class="fr">
         <el-button type="primary" size="small">导入</el-button>
-        <el-button type="primary" size="small">导出</el-button>
-        <el-button type="primary" size="small">打印</el-button>
+        <el-button type="primary" size="small" @click="handleExport"
+          >导出</el-button
+        >
+        <el-button type="primary" @click="hanlePrint" size="small"
+          >打印</el-button
+        >
       </div>
     </div>
     <div class="mymain-container">
@@ -89,6 +149,8 @@
           border
           fit
           highlight-current-row
+          @select-all="hanleSelectAll"
+          @select="hanleSelectAll"
           stripe
         >
           <el-table-column type="selection" align="center"></el-table-column>
@@ -102,48 +164,48 @@
           <el-table-column
             align="center"
             label="产品型号"
-            prop="number"
+            prop="productModel"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="套机编码"
-            prop="code"
+            prop="composeNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="体积"
-            prop="volume"
+            prop="productVolume"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="内机编码"
-            prop="inCode"
+            prop="innerMachineNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="外机编码"
-            prop="outCode"
+            prop="outsideMachineNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="配件1"
-            prop="partsOne"
+            prop="parts1"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="配件2"
+            label="parts2"
             prop="partsTwo"
             min-width="160"
             show-overflow-tooltip
@@ -151,14 +213,14 @@
           <el-table-column
             align="center"
             label="创建人"
-            prop="create"
+            prop="createBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="创建时间"
-            prop="createDate"
+            prop="createTime"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -166,14 +228,14 @@
           <el-table-column
             align="center"
             label="更新人"
-            prop="update"
+            prop="updateBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="更新时间"
-            prop="updateDate"
+            prop="updateTime"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -184,16 +246,37 @@
             min-width="160"
             show-overflow-tooltip
           >
-            <el-button type="text" class="textColor" @click="editFn"
-              >编辑</el-button
-            >
-            <el-button type="text" class="textColor">删除</el-button>
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                class="textColor"
+                @click="editFn(scope.row.id, scope.row)"
+                >编辑</el-button
+              >
+              <el-popconfirm
+                confirm-button-text="好的"
+                cancel-button-text="不用了"
+                icon="el-icon-info"
+                icon-color="red"
+                title="内容确定删除吗？"
+                @onConfirm="hanleDelete(scope.row.id)"
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  class="textColor el-popover-left"
+                  >删除</el-button
+                >
+              </el-popconfirm>
+            </template>
           </el-table-column>
         </el-table>
       </div>
       <!-- 分页 -->
       <div class="fr">
         <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
@@ -214,7 +297,7 @@
     >
       <el-form ref="form" :model="diaLogForm" label-width="100px">
         <el-form-item label="产品名称">
-          <el-select
+          <!-- <el-select
             v-model="diaLogForm.positionName"
             multiple
             placeholder="请选择"
@@ -226,16 +309,17 @@
               :value="item.value"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
+          <el-input v-model="diaLogForm.storeName"></el-input>
         </el-form-item>
         <el-form-item label="产品型号">
-          <el-input v-model="diaLogForm.storeName"></el-input>
+          <el-input v-model="diaLogForm.productModel"></el-input>
         </el-form-item>
         <el-form-item label="套机棉麻">
-          <el-input v-model="diaLogForm.alert"></el-input>
+          <!-- <el-input v-model="diaLogForm.alert"></el-input> -->
         </el-form-item>
         <el-form-item label="产品体积">
-          <el-input v-model="diaLogForm.alert"></el-input>
+          <el-input v-model="diaLogForm.productVolume"></el-input>
         </el-form-item>
         <el-form-item label="内机编码">
           <el-select
@@ -300,16 +384,25 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="showDialogForm = false">取 消</el-button>
-        <el-button type="primary" @click="showDialogForm = false"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="hanleInfo">确 定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
-
+<!-- /product-compose/export -->
 <script>
+import Mixin from "@/mixin/index";
+import { downloadFiles, handleImport } from "@/utils/util";
+
+import {
+  getProductList,
+  getProductEdit,
+  getProductDetail,
+  getProductDel,
+  getProductAdd,
+} from "@/api/basic_data/material";
 export default {
+  mixins: [Mixin],
   data() {
     return {
       currentPage: 1, // 当前页码
@@ -338,10 +431,16 @@ export default {
         },
       ],
       diaLogForm: {
-        storeName: "",
-        positionName: [],
-        alert: "",
-        text: "",
+        id: null,
+        composeNumber: "5464",
+        items: [
+          { id: "1", innerOutsideMachineId: "dfsf", parentId: "dsfs" },
+          { id: "2", innerOutsideMachineId: "dfsf", parentId: "sdfdsf" },
+        ],
+        materialId: "454",
+        orgNumber: 454,
+        productModel: "5454545",
+        productVolume: 2,
       },
       showDialogForm: false,
       dataList: [
@@ -403,15 +502,127 @@ export default {
         },
       ],
       searchForm: {
-        positionName: "",
-        storeName: "",
+        innerName: "",
+        innerNumber: "",
+        innerType: "",
+        name: "",
+        number: "",
+        outsideName: "",
+        outsideNumber: "",
+        outsideType: "",
+        type: "",
+        volume: "",
       },
+      type: null,
     };
   },
   methods: {
-    editFn() {
+    getList() {
+      this.listLoading = true;
+      let params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        innerName: this.searchForm.innerName,
+        innerNumber: this.searchForm.innerNumber,
+        innerType: this.searchForm.innerType,
+        name: this.searchForm.name,
+        number: this.searchForm.number,
+        outsideName: this.searchForm.outsideName,
+        outsideNumber: this.searchForm.outsideNumber,
+        outsideType: this.searchForm.outsideType,
+        type: this.searchForm.type,
+        volume: this.searchForm.volume,
+      };
+      getProductList(params).then((res) => {
+        this.dataList = res.data.records;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      });
+    },
+    editFn(id, row) {
+      this.type = 2;
+      this.diaLogForm = {
+        id,
+        composeNumber: row.composeNumber,
+        items:
+          row.items === undefined
+            ? [
+                { id: "1", innerOutsideMachineId: "df", parentId: "dsf" },
+                { id: "2", innerOutsideMachineId: "ew", parentId: "wew" },
+              ]
+            : row.items,
+        materialId: row.materialId,
+        orgNumber: row.orgNumber,
+        productModel: row.productModel,
+        productVolume: row.productVolume,
+        positionName: row.positionName,
+      };
+
       this.showDialogForm = true;
     },
+    hanleInfo() {
+      if (this.type === 1) {
+
+        // {
+
+        // }
+        getProductAdd(this.diaLogForm).then((res) => {
+          this.$successMsg("保存成功");
+          this.getList();
+        });
+      } else if (this.type === 2) {
+        const params = {
+          composeNumber: this.diaLogForm.composeNumber,
+          id: this.diaLogForm.id,
+          items: [
+            {
+              id: "445",
+              innerOutsideMachineId: "4545",
+              parentId: "4554",
+            },
+          ],
+          materialId: this.diaLogForm.materialId,
+          orgNumber: this.diaLogForm.orgNumber,
+          productModel: this.diaLogForm.productModel,
+          productVolume: this.diaLogForm.productVolume,
+        };
+        getProductEdit(params).then((res) => {
+          this.$successMsg("编辑成功");
+          this.getList();
+        });
+        this.diaLogForm.id = null;
+      }
+
+      this.showDialogForm = false;
+    },
+    hanleDelete(id) {
+      this.hanleDeleteAllPromise(id).then((ids) => {
+        getProductDel({ ids: ids.join(",") }).then((res) => {
+          this.$successMsg("删除成功");
+          this.getList();
+        });
+      });
+    },
+    handleExport() {
+      let screenData = {
+        customerName: this.screenForm.customerName,
+        freeDay: this.screenForm.freeDay,
+        toll: this.screenForm.toll,
+      };
+      downloadFiles("/product-compose/export", screenData);
+    },
+    resetInfo() {
+      this.diaLogForm = {
+        id: null,
+        composeNumber: "",
+        id: "",
+        items: [],
+        materialId: "",
+        orgNumber: 0,
+        productModel: "",
+        productVolume: "",
+      };
+    },
   },
 };
 </script>
@@ -420,4 +631,4 @@ export default {
 ::v-deep .el-select {
   width: 100%;
 }
-</style>
+</style>

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -201,12 +201,6 @@
               <el-button
                 type="text"
                 class="textColor"
-                @click="hanleDetail(scope.row)"
-                >详情</el-button
-              >
-              <el-button
-                type="text"
-                class="textColor"
                 @click="editFn(scope.row.id, scope.row)"
                 >编辑</el-button
               >
@@ -233,6 +227,8 @@
       <!-- 分页 -->
       <div class="fr">
         <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
@@ -297,7 +293,7 @@
 
 <script>
 import Mixin from "@/mixin/index";
-import { findElem, downloadFiles, handleImport } from "@/utils/util";
+import { downloadFiles, handleImport } from "@/utils/util";
 
 import {
   getListToll,
@@ -485,6 +481,10 @@ export default {
 .zhu {
   padding-top: 18px;
 }
+.import-btn {
+  display: inline-block;
+  margin-right: 10px;
+}
 .set {
   margin-bottom: 30px;
 }

src/views/basic_data/warehouse/warehouse_site.vue

@@ -41,10 +41,10 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small" @click="showDialogForm = true,type=1"
+        <el-button type="primary" size="small" @click="newData"
           >新增</el-button
         >
-        <el-button type="primary" size="small" @click="showDialogForm = true,type=2">编辑</el-button>
+        <!-- <el-button type="primary" size="small" @click="showDialogForm = true,type=2">编辑</el-button> -->
         <el-button type="primary" size="small">删除</el-button>
       </div>
     </div>
@@ -77,13 +77,18 @@
           <el-table-column
             align="center"
             label="仓位名称"
-            prop="kingDeeStocks.name"
-            min-width="160"
+            prop="kingDeeStocks"
+            min-width="300"
+            :formatter="formDatas"
             show-overflow-tooltip
           >
-            <!-- <template slot-scope="scope">
-            {{scope.row.kingDeeStocks.name}}
-          </template> -->
+          <template slot-scope="scope">
+            <template v-if="scope.row.kingDeeStocks.length>1">
+            <el-tag type="danger" v-for="item in scope.row.kingDeeStocks">
+             {{item.name}}
+            </el-tag>
+            </template>
+          </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -140,7 +145,7 @@
             min-width="160"
             show-overflow-tooltip
           >
-      <template slot-scope="scope">
+        <template slot-scope="scope">
               <el-button
                 type="text"
                 class="textColor"
@@ -176,6 +181,8 @@
       <!-- 分页 -->
       <div class="fr">
         <el-pagination
+        @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
@@ -205,12 +212,12 @@
           <el-input v-model="diaLogForm.name"></el-input>
         </el-form-item>
         <el-form-item label="仓位名称">
-          <el-select v-model="diaLogForm.name" multiple placeholder="请选择">
+          <el-select v-model="diaLogForm.stockIds" @change="onChange"  multiple placeholder="请选择">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in cList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -238,7 +245,7 @@
 
 <script>
 import Mixin from "@/mixin/index";
-import { getListStock,addStock,updateStock,deleteStock } from "@/api/basic_data/warehouse";
+import { getListStock,addStock,updateStock,deleteStock,getList } from "@/api/basic_data/warehouse";
 export default {
   mixins: [Mixin],
   data() {
@@ -279,17 +286,36 @@ export default {
     	updateTime: ""
       },
       showDialogForm: false,
-      searchForm: {
+      screenForm: {
         name: "",
         storeName: "",
       },
+       screenForm2: {
+        // 筛选表单数据
+        name: "", // 名称
+      },
       type:null,
+      cList:{},
+
     };
   },
   methods: {
     addFn() {
       this.showDialogForm = true;
     },
+    newData(){
+      this.showDialogForm = true
+      this.type=1
+        const params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        name:''
+      }
+      getList(params).then(res=>{
+        this.cList = res.data.records;
+        this.listTotal = res.data.total;
+      })
+    },
      //显示编辑，编辑数据初始化
     editFn(id, row) {
       this.type = 2;
@@ -303,8 +329,25 @@ export default {
       };
       this.showDialogForm = true;
     },
+    formDatas(row){
+      console.log(row.kingDeeStocks);
+      let str = ''
+//       row.kingDeeStocks.forEach(item => {
+//           str+= item.name
+//       });
+// return str
+      // let a = (row && row.kingDeeStocks) || []
+      // let arr = []
+      // console.log(a);
+      //   a.forEach(item => {
+
+      //       arr.push(item)
+      //   });
+      //   return arr.join(',')
+    },
     hanleInfo() {
       if (this.type===1) {
+
           addStock(this.diaLogForm).then((res) => {
           this.$successMsg("保存成功");
           this.showDialogForm = false;
@@ -352,7 +395,8 @@ export default {
             this.$successMsg("删除成功");
                   this.getList();
         })
-    }
+    },
+
   },
 };
 </script>