Merge branch 'feature/Feature-basic_data' into develop

src/api/basic_data/material.js

@@ -117,6 +117,22 @@ export function getProductRriceAdd(params) {
   })
 }
 
+export function getDistList(params) {
+  return request({
+    url:'/common/dict/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getProductRricedel(params) {
+  return request({
+    url:'/product-upd-price/del',
+    method: 'post',
+    params:{ids:params.join(',')}
+  })
+}
+
 export function getProductRriceConfirm(params) {
   return request({
     url:'/product-upd-price/confirm',

src/api/basic_data/taker.js

@@ -24,6 +24,14 @@ export function addDataList(data) {
     data
   })
 }
+//删除提货人档案
+export function deleDataList(params) {
+  return request({
+    url: '/taker-record/del',
+    method: 'POST',
+    params
+  })
+}
 //提货人档案列表导出
 export function exportDataList(params) {
   return request({

src/api/basic_data/warehouse.js

@@ -123,3 +123,13 @@ export function getCustomerList(params) {
     params
   })
 }
+
+
+
+export function addReserve(params) {
+  return request({
+    url: '/stock/addReserve',
+    method: 'post',
+    data:params
+  })
+}

src/views/basic_data/dealer/components/dealer_list-detail.vue

@@ -3,231 +3,277 @@
     <div class="sty">
       <el-page-header @back="goBack" content="详情页面"> </el-page-header>
     </div>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>客户</span>
-      </div>
-      <el-row>
-        <el-col :span="8"
-          ><span class="color">创建组织</span
-          ><input v-model="infoForm.a" type="text"
-        /></el-col>
-        <el-col :span="8"
-          ><span>客户编码</span><input v-model="infoForm.number" type="text"
-        /></el-col>
-        <el-col :span="8"
-          ><span class="color">使用组织</span
-          ><input v-model="infoForm.useOrgId" type="text"
-        /></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8"><span>简称</span><input type="text" /></el-col>
-      </el-row>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>基本信息</span>
-      </div>
-      <div class="baseInfo">
+    <el-form
+      :model="infoList"
+      label-width="130px"
+      size="small"
+      label-position="right"
+    >
+      <el-card class="">
+        <div slot="header" class="clearfix">
+          <strong>客户</strong>
+        </div>
         <div>
-          <div class="base-header">
-            <span>地址</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">国家</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">地区</span
-              ><input v-model="infoForm.region" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">省份</span
-              ><input v-model="infoForm.province" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">城市</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">通讯地址</span
-              ><input v-model="infoForm.invoiceAddress" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">邮政编码</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">公司网址</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">商城订单对应组织</span
-              ><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">联系邮箱</span
-              ><input v-model="infoForm.email" type="text"
-            /></el-col>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="创建组织" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="客户编码" prop="takerName">
+                <el-input
+                  v-model="infoList.number"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="使用组织" prop="telephone">
+                <el-input
+                  v-model="infoList.useOrgName"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="简称" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
+          <!-- </el-form> -->
         </div>
+      </el-card>
+      <br />
+      <el-card class="">
+        <div slot="header" class="clearfix">
+          <strong>基本信息</strong>
+        </div>
+        <span>地址</span>
+        <el-divider></el-divider>
         <div>
-          <div class="base-header">
-            <span>管理</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">联系电话</span
-              ><input v-model="infoForm.mobile" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">传真</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">公司类别</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">公司性质</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">公司规模</span><input type="text"
-            /></el-col>
-          </el-row>
-          <div class="base-header">
-            <span>开票信息</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">发票抬头</span
-              ><input v-model="infoForm.invoiceTitle" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">纳税登记号</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">开户银行</span
-              ><input v-model="infoForm.bank" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">银行账号</span
-              ><input v-model="infoForm.bankAccount" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">开票联系电话</span
-              ><input v-model="infoForm.invoicePhone" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">开票通讯地址</span
-              ><input v-model="infoForm.invoiceAddress" type="text"
-            /></el-col>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="国家" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="地区" prop="takerName">
+                <el-input
+                  v-model="infoList.region"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="省份" prop="telephone">
+                <el-input
+                  v-model="infoList.province"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="城市" prop="telephone">
+                <el-input
+                  v-model="infoList.city"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="通信地址" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="邮政编码" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="公司网址" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="商城订单对应组织" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="联系邮箱" prop="telephone">
+                <el-input
+                  v-model="infoList.email"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
+          <!-- </el-form> -->
         </div>
+        <span>管理</span>
+        <el-divider></el-divider>
         <div>
-          <div class="base-header">
-            <span>相关</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">对应供应商</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">对应集团客户</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">集团客户</span><input type="checkbox"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">默认付款方</span><input type="checkbox"
-            /></el-col>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="联系电话" prop="">
+                <el-input
+                  v-model="infoList.mobile"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="传真" prop="takerName">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="公司类别" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="公司性质" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="公司规模" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">不校验可发量</span><input type="checkbox"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">客户类别</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">客户分组</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">对应组织</span><input type="text"
-            /></el-col>
+          <!-- </el-form> -->
+        </div>
+        <span>相关</span>
+        <el-divider></el-divider>
+        <div>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="对应供应商" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="对应集团客户" prop="takerName">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="客户类别" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="客户分组" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="集团客户" prop="telephone">
+                <el-checkbox></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="默认付款方" prop="telephone">
+                <el-checkbox></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="不校验可发量" prop="telephone">
+                <el-checkbox></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="对应组织" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="备注" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">备注</span><input type="text"
-            /></el-col>
+          <!-- </el-form> -->
+        </div>
+        <span>开票信息</span>
+        <el-divider></el-divider>
+        <div>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发票抬头" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="纳税登记号" prop="takerName">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="开户银行" prop="telephone">
+                <el-input
+                  v-model="infoList.bank"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="银行账号" prop="telephone">
+                <el-input
+                  v-model="infoList.bankAccount"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="开票联系电话" prop="telephone">
+                <el-input
+                  v-model="infoList.invoicePhone"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="开票通讯地址" prop="telephone">
+                <el-input
+                  v-model="infoList.invoiceAddress"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <div class="base-header">
-            <span>智慧订货</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">允许对智慧订货</span><input type="checkbox"
-            /></el-col>
+          <!-- </el-form> -->
+        </div>
+        <span>智慧订货</span>
+        <el-divider></el-divider>
+        <div>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="允许对接智慧订单" prop="">
+                <el-checkbox></el-checkbox>
+              </el-form-item>
+            </el-col>
           </el-row>
+          <!-- </el-form> -->
         </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>信用额度</span>
-      </div>
-      <el-row>
-        <el-col :span="8"
-          ><span class="color">信用额度</span><input type="text"
-        /></el-col>
-        <el-col :span="8"><span>有效期</span><input type="text" /></el-col>
-        <el-col :span="8"></el-col>
-      </el-row>
-    </el-card>
-    <el-card class="box-card">
+      </el-card>
+    </el-form>
+    <br />
+    <el-card>
       <div slot="header" class="clearfix">
-        <span>业务信息</span>
+        <strong>信用额度</strong>
       </div>
     </el-card>
   </div>
@@ -242,45 +288,11 @@ export default {
     },
   },
   data() {
-    return {
-      infoForm: {
-        adminUserId: "",
-        bank: "",
-        bankAccount: "",
-        bindUser: true,
-        city: "",
-        createBy: "",
-        createTime: "",
-        creditAmount: 0,
-        email: "",
-        forbidStatus: "",
-        id: "",
-        invoiceAddress: "",
-        invoicePhone: "",
-        invoiceTitle: "",
-        mobile: "",
-        name: "",
-        number: "",
-        province: "",
-        region: "",
-        saleDeptName: "",
-        saleDeptNumber: "",
-        syncTime: "",
-        taxNo: "",
-        updateBy: "",
-        updateTime: "",
-        useOrgId: "",
-        useOrgName: "",
-        useOrgNumber: "",
-      },
-    };
-  },
-  created() {
-    this.infoForm = this.infoList;
+    return {};
   },
+  created() {},
   methods: {
     goBack() {
-      console.log(this.$parent);
       this.$parent.isShow = true;
     },
   },
@@ -288,57 +300,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.color {
-  color: #1f93ec;
-}
-.el-col-24 {
-  margin: 6px 0;
-}
-
-.marg-r {
-  padding-right: 15px;
-  font-size: 12px;
-  display: inline-block;
-  width: 120px;
-}
-.base-header {
-  height: 20px;
-  width: 60%;
-  border-bottom: 2px solid gray;
-  span {
-    width: 100px;
-    height: 100%;
-    display: block;
-    text-align: center;
-    color: #fff;
-
-    background-color: gray;
-  }
-}
-.box-card {
-  margin-bottom: 20px;
-}
-.el-col-8 {
-  span {
-    padding-right: 10px;
-    display: inline-block;
-    width: 100px;
-  }
-}
-.baseInfo {
-  display: flex;
-  justify-content: space-between;
-  > div {
-    width: 33%;
-  }
-}
 .sty {
   margin-bottom: 20px;
 }
-.el-row {
-  margin-bottom: 20px;
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
 </style>

src/views/basic_data/dealer/dealer_deposit.vue

@@ -139,8 +139,8 @@
               >
                 <el-button type="text" class="textColor" slot="reference"
                   >删除</el-button
-                ></el-popconfirm
-              >
+                >
+              </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
@@ -192,12 +192,19 @@
         </el-form-item>
 
         <el-form-item label="押金比例" prop="rate">
-          <el-input v-model.number="dialogForm.rate" class="inputStyle">
+          <el-input
+            placeholder="请输入押金比例"
+            @focus="rateFn"
+            v-model.number="dialogForm.rate"
+            class="inputStyle"
+          >
             <i class="el-input__icon" slot="suffix">% </i>
           </el-input>
         </el-form-item>
         <el-form-item label="押金定额金额" prop="amount">
           <el-input
+            placeholder="请输入押金定额"
+            @focus="amountFn"
             v-model.number="dialogForm.amount"
             class="inputStyle"
           ></el-input>
@@ -254,26 +261,6 @@ import { number } from "echarts";
 
 export default {
   data() {
-    // var amount = (rule, value, callback) => {
-    //   console.log(rule, value);
-    //   console.log(this.dialogForm);
-    //   if (this.dialogForm.rate !== 0) {
-    //     this.$message.warning("已选押金比例,如需选择定额押金,请把押金比例归零");
-    //     // callback(new Error("已选押金比例,如需选择定额押金,请把押金比例归零"));
-    //   } else {
-    //     callback();
-    //   }
-    // };
-    // var rate = (rule, value, callback) => {
-    //   console.log(rule, value);
-    //   console.log(this.dialogForm);
-    //   if (this.dialogForm.amount !== 0) {
-    //     this.$message.warning("已选定额押金,如需选择押金比例,请把定额押金归零");
-    //     // callback(new Error("已选定额押金,如需选择押金比例,请把定额押金归零"));
-    //   } else {
-    //     callback();
-    //   }
-    // };
     return {
       title: "",
       currentPage: 1, // 当前页码
@@ -351,7 +338,19 @@ export default {
     await this.getList({ pageNum: 1, pageSize: 10 });
     await this.getDealerDataList({ pageNum: 1, pageSize: 10 });
   },
+
   methods: {
+    //押金
+    amountFn(e) {
+      if (this.dialogForm.rate != 0 || this.dialogForm.rate != "") {
+        this.$message.warning("已选押金比例,如需选择定额押金,请把押金比例归零");
+      }
+    },
+    rateFn(e) {
+      if (this.dialogForm.amount != 0 || this.dialogForm.amount != "") {
+        this.$message.warning("已选定额押金,如需选择押金比例,请把定额押金归零");
+      }
+    },
     //取消
     async cancelFn() {
       await this.$refs.dialogForm.resetFields();

src/views/basic_data/dealer/dealer_list.vue

@@ -64,13 +64,7 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据状态"
-              prop="danJuZhuangTai"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
+
             <el-table-column
               prop="forbidStatus"
               align="center"
@@ -96,25 +90,19 @@
             ></el-table-column>
             <el-table-column
               align="center"
-              label="审核人"
-              prop="shenHeRen"
+              label="更新人"
+              prop="updateBy"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="审核日期"
-              prop="shenHeDate"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="客户分组"
-              prop="keHu"
+              label="更新时间"
+              prop="updateTime"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
+
             <el-table-column
               align="center"
               label="操作"

src/views/basic_data/logistics/logistics_list.vue

@@ -214,30 +214,35 @@
     <el-dialog
       title="提货车辆档案"
       :visible.sync="showDialogForm"
-      width="30%"
+      width="50%"
       :show-close="false"
       :close-on-click-modal="false"
     >
-      <el-form ref="form" :model="diaLogForm" label-width="100px">
-        <el-form-item label="物流公司名称">
+      <el-form
+        ref="form"
+        :rules="type == 2 ? rules : ''"
+        :model="diaLogForm"
+        label-width="120px"
+      >
+        <el-form-item label="物流公司名称" prop="logisticsCompany">
           <el-input v-model="diaLogForm.logisticsCompany"></el-input>
         </el-form-item>
-        <el-form-item label="物流公司代码">
+        <el-form-item label="物流公司代码" prop="logisticsNumber">
           <el-input v-model="diaLogForm.logisticsNumber"></el-input>
         </el-form-item>
-        <el-form-item label="提货人">
+        <el-form-item label="提货人" prop="pickName">
           <el-input v-model="diaLogForm.pickName"></el-input>
         </el-form-item>
-        <el-form-item label="提货人电话">
+        <el-form-item label="提货人电话" prop="pickTel">
           <el-input v-model="diaLogForm.pickTel"></el-input>
         </el-form-item>
-        <el-form-item label="客服电话">
+        <el-form-item label="客服电话" prop="customerTel">
           <el-input v-model="diaLogForm.customerTel"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="hanleCancel">取 消</el-button>
-        <el-button type="primary" @click="handelInfo">确 定</el-button>
+        <el-button @click="hanleCancel('form')">取 消</el-button>
+        <el-button type="primary" @click="handelInfo('form')">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -251,7 +256,7 @@ import {
   updateInfo,
   deleteInfo,
 } from "@/api/basic_data/logistics";
-import { downloadFiles } from "@/utils/util";
+import { downloadFiles ,importFileList} from "@/utils/util";
 export default {
   mixins: [Mixin],
   data() {
@@ -274,6 +279,23 @@ export default {
         logisticsCompany: "",
       },
       ids: [],
+      rules: {
+        logisticsCompany: [
+          { required: true, message: "请输入物流公司名称", trigger: "blur" },
+        ],
+        logisticsNumber: [
+          { required: true, message: "请输入物流公司代码", trigger: "blur" },
+        ],
+        pickName: [
+          { required: true, message: "请输入提货人", trigger: "blur" },
+        ],
+        pickTel: [
+          { required: true, message: "请输入提货人电话", trigger: "blur" },
+        ],
+        customerTel: [
+          { required: true, message: "请输入客服电话", trigger: "blur" },
+        ],
+      },
     };
   },
   methods: {
@@ -312,7 +334,7 @@ export default {
       });
     },
     //新增数据或者编辑数据请求接口  type 1 为编辑  type 2 新增
-    handelInfo() {
+    handelInfo(formName) {
       if (this.type === 1) {
         const params = {
           ...this.diaLogForm,
@@ -325,17 +347,23 @@ export default {
         });
         this.diaLogForm.id = null;
       } else if (this.type === 2) {
-        addInof(this.diaLogForm).then((res) => {
-          this.$successMsg("保存成功");
-          this.showDialogForm = false;
-          this.hanleCancel();
-          this.getList();
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            addInof(this.diaLogForm).then((res) => {
+              this.$successMsg("保存成功");
+              this.showDialogForm = false;
+              this.hanleCancel();
+              this.getList();
+            });
+          } else {
+            console.log("error submit!!");
+            return false;
+          }
         });
       } else {
         this.showDialogForm = false;
       }
     },
-
     //查看详情
     hanleDetail(detail) {
       this.type = 3;
@@ -362,15 +390,16 @@ export default {
       });
     },
     // 取消按钮重置数据
-    hanleCancel() {
-      this.diaLogForm = {
-        id: null,
-        customerTel: "",
-        logisticsCompany: "",
-        logisticsNumber: "",
-        pickName: "",
-        pickTel: "",
-      };
+    hanleCancel(form) {
+      this.$refs['form'].resetFields()
+      // this.diaLogForm = {
+      //   id: null,
+      //   customerTel: "",
+      //   logisticsCompany: "",
+      //   logisticsNumber: "",
+      //   pickName: "",
+      //   pickTel: "",
+      // };
       this.showDialogForm = false;
     },
   },

src/views/basic_data/material/category_list.vue

@@ -35,11 +35,11 @@
             highlight-current-row
             stripe
           >
-            <el-table-column
+            <!-- <el-table-column
               type="selection"
               align="center"
               min-width="100"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               align="center"
               label="编码"

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

@@ -87,9 +87,8 @@
     </div>
     <div class="mymain-container">
       <!-- 列表 -->
-
       <div class="table">
-        <el-form :model="items" ref="form" size="small" label-position="left">
+        <el-form :model="items" v-if="!detail.length"  size="small" label-position="left">
           <el-table
             v-loading="listLoading"
             :data="items"
@@ -107,12 +106,15 @@
               show-overflow-tooltip
             >
               <!-- <el-button type="text" class="textColor">修改</el-button> -->
-              <el-button type="text" class="textColor">删除</el-button>
+            <template slot-scope="scope">
+                <el-button type="text" class="textColor" @click="hanleDeleInd(scope.$index)">删除</el-button>
+            </template>
             </el-table-column>
             <el-table-column
               align="center"
               label="销售类型"
               prop="saleTypeId"
+
               min-width="160"
               show-overflow-tooltip
             >
@@ -337,7 +339,257 @@
             </el-table-column>
           </el-table>
         </el-form>
+        <el-form :model="detail" v-else size="small" label-position="left">
+          <el-table
+            v-loading="listLoading"
+            :data="detail"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <el-table-column
+              align="center"
+              label="操作类型"
+              prop="nname"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <!-- <el-button type="text" class="textColor">修改</el-button> -->
+            <template slot-scope="scope">
+                <el-button type="text" class="textColor" @click="hanleDeleInd(scope.$index)">删除</el-button>
+            </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="销售类型"
+              prop="saleTypeId"
+
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                   <el-select placeholder="请选择销售类型" v-model="scope.row.saleTypeId">
+                <el-option  v-for="item in typeList" :label="item.name" :value="item.id"></el-option>
+
+              </el-select>
 
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="存货编码"
+              prop="materialNumber"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.materialNumber"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="存货名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.materialName"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="规格型号"
+              prop="specification"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.specification"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="计量单位"
+              prop="company"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.SalesType"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="批发价"
+              prop="batchPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.batchPrice"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="零售价"
+              prop="retailPrice"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.retailPrice"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="返利使用比例"
+              prop="rebateUseRate"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.rebateUseRate"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="生效日期"
+              prop="startDate"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-date-picker
+                    v-model="scope.row.startDate"
+                    type="date"
+                    placeholder="请输入调价日期"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="失效日期"
+              prop="endDate"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-date-picker
+                    v-model="scope.row.endDate"
+                    type="date"
+                    placeholder="请输入调价日期"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="是否促销价"
+              prop="isPromote"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-select
+                    v-model="scope.row.isPromote"
+                    @change="hanleChange"
+                    placeholder="请选择是否促销价"
+                  >
+                    <el-option
+                      v-for="item in scope.row.isPromoteArr"
+                      :key="item.bool"
+                      :value="item.bool"
+                      :label="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="数量"
+              prop="qty"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.qty"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="支付钱包类型"
+              prop="wallets"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-select
+                    v-model="scope.row.isPublish"
+                    @change="hanleChange"
+                    placeholder="请选择支付钱包类型"
+                  >
+                    <el-option
+                      v-for="item in scope.row.rebateList"
+                      :key="item.bool"
+                      :value="item.bool"
+                      :label="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="发布"
+              prop="isPublish"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-select
+                    v-model="scope.row.isPublish"
+                    @change="hanleChange"
+                    placeholder="请选择是否发布"
+                  >
+                    <el-option
+                      v-for="item in scope.row.isPublishArr"
+                      :key="item.bool"
+                      :value="item.bool"
+                      :label="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
         <el-dialog
           title="提示"
           :visible.sync="centerDialogVisible"
@@ -390,17 +642,17 @@ export default {
   data() {
     return {
       base: {
-        adminCompanyId: "5454",
-        adminWebsitId: "345",
-        billId: "34324",
-        examineNote: "234",
+        adminCompanyId: "3",
+        adminWebsitId: "3",
+        billId: "5",
+        examineNote: "5",
         examineResult: true,
-        examineStatus: "2342",
+        examineStatus: "",
         id: null,
-        operatorId: "234",
-        operatorName: "3223",
-        remark: "2332",
-        saleTypeId: "2332",
+        operatorId: "",
+        operatorName: "",
+        remark: "",
+        saleTypeId: "33",
       },
       items: [
 
@@ -411,7 +663,8 @@ export default {
       rebateList:[],
       typeList:[],
       saleTypeId:'',
-      remark:''
+      remark:'',
+      detail:[]
     };
   },
   mounted() {
@@ -433,6 +686,14 @@ export default {
     goBack() {
       this.$parent.show = 1;
     },
+     indexMethod(index) {
+      console.log(index);
+
+      },
+    hanleDeleInd(index){
+
+        this.items.splice(index,1)
+    },
     getMaterialList(){
       let rebateParams={
         pageNum:1,
@@ -479,7 +740,7 @@ export default {
         wallets: [
           {
                  billId:'44',
-                 id:'55',
+                 id:'',
                 mainId:'',
               parentId:'',
                parentItemId:''
@@ -567,6 +828,14 @@ export default {
           remark: "2332",
           saleTypeId: "2332",
         };
+
+        getProductRriceDetail({id:res.data}).then(res=>{
+          this.base={
+              ...res.data
+          }
+
+          this.detail = res.data.items
+        })
       });
     },
   },

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

@@ -16,12 +16,17 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据编号" prop="billId">
-              <el-input placeholder="请输入" v-model="detail.billId"></el-input>
+              <el-input
+                placeholder="请输入"
+                disabled
+                v-model="detail.billId"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="调价日期" prop="account">
               <el-date-picker
+                disabled
                 v-model="value1"
                 type="date"
                 placeholder="选择日期"
@@ -31,12 +36,13 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="调价部门" prop="account">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder="请输入" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="调价业务员" prop="operatorName">
               <el-input
+                disabled
                 placeholder="请输入"
                 v-model="detail.operatorName"
               ></el-input>
@@ -46,6 +52,7 @@
             <el-form-item label="制单日期" prop="account">
               <el-date-picker
                 v-model="value1"
+                disabled
                 type="date"
                 placeholder="选择日期"
               >
@@ -54,7 +61,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="销售类型" prop="account">
-              <el-select placeholder="请选择活动区域">
+              <el-select placeholder="请选择活动区域" disabled>
                 <el-option label="区域一" value="shanghai"></el-option>
                 <el-option label="区域二" value="beijing"></el-option>
               </el-select>
@@ -63,6 +70,7 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="文件编码" prop="operatorName">
               <el-input
+                disabled
                 placeholder="请输入"
                 v-model="detail.operatorName"
               ></el-input>
@@ -200,19 +208,21 @@
           <el-row :gutter="0">
             <el-col :xs="12" :sm="12" :lg="12" class="item">
               <div class="label">审批人</div>
-              <div class="value">2022123233435342</div>
+              <div class="value">{{ detail.operatorName }}</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>
+                <el-radio-group v-model="detail.examineResult">
+                  <el-radio label="0">通过</el-radio>
+                  <el-radio label="1">驳回</el-radio>
+                </el-radio-group>
               </div>
             </el-col>
 
             <el-col :xs="24" :sm="24" :lg="24" class="item">
               <div class="label">审批说明</div>
-              <div class="value">2022123233435342</div>
+              <div class="value">{{ detail.examineNote }}</div>
             </el-col>
           </el-row>
         </div>
@@ -222,9 +232,9 @@
             <el-button type="primary" size="small" @click="onSubmit"
               >提交审批</el-button
             >
-            <el-button type="primary" size="small" @click="resetScreenForm"
+            <!-- <el-button type="primary" size="small" @click="resetScreenForm"
               >重置</el-button
-            >
+            > -->
           </div>
         </div>
       </el-form>
@@ -273,10 +283,10 @@ export default {
     onSubmit() {
       const params = {
         ...this.detail,
-        // confirmResult:this.radio
+        qty: 23,
       };
       getProductRriceConfirm(params).then((res) => {
-        console.log(res);
+         this.$successMsg("已提交审核");
       });
     },
     resetScreenForm() {

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

@@ -6,16 +6,27 @@
     <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="请输入" v-model="detail.billId"></el-input>
+            <el-form-item label="单据编号" prop="billId">
+              <el-input
+                placeholder="请输入"
+                disabled
+                v-model="detail.billId"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="调价日期" prop="account">
               <el-date-picker
+                disabled
                 v-model="value1"
                 type="date"
                 placeholder="选择日期"
@@ -25,18 +36,23 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="调价部门" prop="account">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder="请输入" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价业务员" prop="account">
-              <el-input placeholder="请输入" v-model="detail.operatorName"></el-input>
+            <el-form-item label="调价业务员" prop="operatorName">
+              <el-input
+                disabled
+                placeholder="请输入"
+                v-model="detail.operatorName"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单日期" prop="account">
               <el-date-picker
                 v-model="value1"
+                disabled
                 type="date"
                 placeholder="选择日期"
               >
@@ -45,165 +61,170 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="销售类型" prop="account">
-              <el-select placeholder="请选择活动区域">
+              <el-select placeholder="请选择活动区域" disabled>
                 <el-option label="区域一" value="shanghai"></el-option>
                 <el-option label="区域二" value="beijing"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="文件编码" prop="account">
-              <el-input placeholder="请输入" v-model="detail.operatorName"></el-input>
+            <el-form-item label="文件编码" prop="operatorName">
+              <el-input
+                disabled
+                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
 
-          :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>
-    </div>
-    <br />
+        <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>
+        </div>
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="8" :lg="8" class="item">
           <div class="label">审批人</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{detail.operatorName}}</div>
         </el-col>
         <el-col :xs="12" :sm="8" :lg="8" class="item">
           <div class="label">审批结果</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{detail.examineResult?'通过':'驳回'}}</div>
         </el-col>
         <el-col :xs="12" :sm="8" :lg="8" class="item">
           <div class="label">审批时间</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{}}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24" class="item">
           <div class="label">审批说明</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{detail.examineNote}}</div>
         </el-col>
       </el-row>
     </div>
+      </el-form>
+    </div>
   </div>
 </template>
 
+
+
 <script>
 export default {
   props:{
@@ -233,6 +254,9 @@ export default {
       ],
     };
   },
+  created() {
+      console.log(this.detail);
+  },
   methods: {
     goBack() {
       console.log(this.$parent);

src/views/basic_data/material/machine_list.vue

@@ -63,22 +63,22 @@
           @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>
+        <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-upload
@@ -105,8 +105,8 @@
           border
           fit
           highlight-current-row
-           @select-all="hanleSelectAll"
-           @select="hanleSelectAll"
+          @select-all="hanleSelectAll"
+          @select="hanleSelectAll"
           stripe
         >
           <el-table-column type="selection" align="center"></el-table-column>
@@ -219,10 +219,10 @@
               <el-button
                 type="text"
                 class="textColor"
-                @click="editFn(scope.row.id,scope.row)"
+                @click="editFn(scope.row.id, scope.row)"
                 >编辑</el-button
               >
-                 <el-popconfirm
+              <el-popconfirm
                 confirm-button-text="好的"
                 cancel-button-text="不用了"
                 icon="el-icon-info"
@@ -233,7 +233,6 @@
                 <el-button
                   slot="reference"
                   type="text"
-
                   class="textColor el-popover-left"
                   >删除</el-button
                 >
@@ -271,61 +270,32 @@
         size="small"
         label-position="left"
       >
-        <el-form-item label="内机名称">
-          <!-- <el-select
-            v-model="diaLogForm.positionName"
-            multiple
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select> -->
-          <el-input v-model="diaLogForm.innerMachineName"></el-input>
-        </el-form-item>
-        <el-form-item label="内机型号">
-          <el-input v-model="diaLogForm.innerMachineType"></el-input>
-        </el-form-item>
-        <el-form-item label="内机编码">
-          <el-input v-model="diaLogForm.innerMachineNumber"></el-input>
-        </el-form-item>
-        <el-form-item label="内机体积">
-          <el-input v-model="diaLogForm.innerMachineVolume"></el-input>
-        </el-form-item>
-        <el-form-item label="外机名称">
-          <!-- <el-select
-            v-model="diaLogForm.positionName"
-            multiple
+        <el-form-item label="类型">
+          <el-select
+            v-model="diaLogForm.type"
+
             placeholder="请选择"
           >
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in distList"
+              :key="item.sysDictId"
+              :label="item.dictValue"
+              :value="item.sysDictId"
             >
             </el-option>
-          </el-select> -->
-          <el-input v-model="diaLogForm.outsideMachineName"></el-input>
+          </el-select>
         </el-form-item>
-        <el-form-item label="外机机型号">
-          <el-input v-model="diaLogForm.outsideMachineType"></el-input>
+        <el-form-item label="名称">
+          <el-input v-model="diaLogForm.name" size="normal"></el-input>
         </el-form-item>
-        <el-form-item label="外机编码">
-          <el-input v-model="diaLogForm.outsideMachineNumber"></el-input>
+        <el-form-item label="型号">
+          <el-input v-model="diaLogForm.model" size="normal"></el-input>
         </el-form-item>
-        <el-form-item label="外机体积">
-          <el-input v-model="diaLogForm.outsideMachineVolume"></el-input>
+        <el-form-item label="编码">
+          <el-input v-model="diaLogForm.number" size="normal"></el-input>
         </el-form-item>
-        <el-form-item label="配件1">
-          <el-input v-model="diaLogForm.parts1"></el-input>
-        </el-form-item>
-        <el-form-item label="配件2">
-          <el-input v-model="diaLogForm.parts2"></el-input>
+        <el-form-item label="体积">
+          <el-input v-model="diaLogForm.volume" size="normal"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -346,6 +316,7 @@ import {
   getMachineAdd,
   getMachineDel,
   getMachineEdit,
+  getDistList
 } from "@/api/basic_data/material";
 export default {
   mixins: [Mixin],
@@ -378,17 +349,22 @@ export default {
       ],
       diaLogForm: {
         id: null,
-        parts1:'',
-        parts2:"",
-        innerMachineName: "",
-        innerMachineNumber: "",
-        innerMachineType: "",
-        innerMachineVolume: 2,
-        orgNumber: "",
-        outsideMachineName: "",
-        outsideMachineNumber: "",
-        outsideMachineType: "",
-        outsideMachineVolume: 2,
+        name: "",
+        number: "",
+        model: "",
+        volume: "",
+        type:''
+        // parts1:'',
+        // parts2:"",
+        // innerMachineName: "",
+        // innerMachineNumber: "",
+        // innerMachineType: "",
+        // innerMachineVolume: 2,
+        // orgNumber: "",
+        // outsideMachineName: "",
+        // outsideMachineNumber: "",
+        // outsideMachineType: "",
+        // outsideMachineVolume: 2,
       },
       showDialogForm: false,
       dataList: [
@@ -484,20 +460,25 @@ export default {
   },
   methods: {
     editFn(id, row) {
-      this.type=2
+      this.type = 2;
       this.diaLogForm = {
         id,
-        parts1:row.parts1,
-        parts2:row.parts2,
-        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,
+        name: row.name,
+        number: row.number,
+        model: row.model,
+        volume: row.volume,
+        type:row.type
+        // parts1:row.parts1,
+        // parts2:row.parts2,
+        // 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;
     },
@@ -519,7 +500,6 @@ export default {
       }
       this.resetInfo();
       this.showDialogForm = false;
-
     },
     // 初始化数据
     getList() {
@@ -538,6 +518,10 @@ export default {
         this.listLoading = false;
         console.log(this.dataList, 1233);
       });
+      getDistList({sysDictEnum:'MACHINE_CONFIGURE'}).then(res=>{
+          this.distList = res.data
+        console.log(res,123);
+      })
     },
     // 导入
     async handleImport(param) {
@@ -572,10 +556,11 @@ export default {
       console.log(id);
       this.hanleDeleteAllPromise(id).then((ids) => {
         getMachineDel(ids).then((res) => {
-           this.getList();
+          this.getList();
         });
       });
     },
+
     resetInfo() {
       this.diaLogForm = {
         id: null,

src/views/basic_data/material/material_list.vue

@@ -44,11 +44,11 @@
             highlight-current-row
             stripe
           >
-            <el-table-column
+            <!-- <el-table-column
               type="selection"
               align="center"
               min-width="100"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               align="center"
               label="使用组织"

src/views/basic_data/material/modify_list.vue

@@ -62,13 +62,28 @@
       <div class="btn-group clearfix">
         <div class="fl">
           <el-button type="primary" size="small" @click="addFn">新增</el-button>
-          <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-popconfirm
+            confirm-button-text="好的"
+            cancel-button-text="不用了"
+            icon="el-icon-info"
+            icon-color="red"
+            title="内容确定删除吗？"
+            @onConfirm="hanleDeleteAll"
+          >
+            <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">打印</el-button>
+          <el-button type="primary" size="small">打印</el-button> -->
         </div>
       </div>
       <div class="mymain-container">
@@ -299,13 +314,9 @@ 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,
+  getProductRricedel,
 } from "@/api/basic_data/material";
 import { downloadFiles } from "@/utils/util";
 export default {
@@ -343,27 +354,28 @@ export default {
         materialNumber: "",
         startDate: "",
       },
+      liDetail: {},
       detail: {},
-      obj:{
-          baseUnitId: "",
-          batchPrice: "",
-          billId: "",
-          endDate: "",
-          id: null,
-          isPromote: "",
-          isPublish: "",
-          materialId: "",
-          materialName: "",
-          materialNumber: "",
-          parentId: "",
-          qty: "",
-          rebateUseRate: "",
-          retailPrice: "",
-          saleTypeId: "",
-          specification: "",
-          startDate: "",
-          wallets: [],
-        }
+      obj: {
+        baseUnitId: "",
+        batchPrice: "",
+        billId: "",
+        endDate: "",
+        id: null,
+        isPromote: "",
+        isPublish: "",
+        materialId: "4",
+        materialName: "",
+        materialNumber: "",
+        parentId: "",
+        qty: "",
+        rebateUseRate: "",
+        retailPrice: "",
+        saleTypeId: "",
+        specification: "",
+        startDate: "",
+        wallets: [],
+      },
     };
   },
   components: {
@@ -375,7 +387,15 @@ export default {
     addFn() {
       this.show = 2;
     },
-    approvalFn() {
+    hanleDeleteAll(id) {
+      this.hanleDeleteAllPromise(id).then((ids) => {
+        getProductRricedel(ids).then((res) => {
+          this.$successMsg("删除成功");
+          this.getList();
+        });
+      });
+    },
+    approvalFn(id) {
       getProductRriceDetail({ id }).then((res) => {
         this.detail = res.data;
         this.show = 3;

src/views/basic_data/material/relation_list.vue

@@ -11,7 +11,7 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="name">
+            <el-form-item label="产品名称" prop="materialName">
               <el-select placeholder="请选择产品品类" v-model="screenForm.name">
                 <el-option
                   v-for="item in materialLis"
@@ -160,7 +160,7 @@
           <el-table-column
             align="center"
             label="产品名称"
-            prop="name"
+            prop="materialName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -208,8 +208,8 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            label="parts2"
-            prop="partsTwo"
+            label="配件2"
+            prop="parts2"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -312,7 +312,7 @@
         <el-form-item label="产品型号">
           <el-input v-model="diaLogForm.productModel"></el-input>
         </el-form-item>
-        <el-form-item label="套机棉麻">
+        <el-form-item label="套机编码">
           <el-input v-model="diaLogForm.composeNumber"></el-input>
         </el-form-item>
         <el-form-item label="产品体积">
@@ -509,7 +509,7 @@ export default {
   mounted() {
       let params = {
         pageNum:1,
-        pageSize: 410,
+        pageSize: 10,
         keyword: '',
       };
       getMaterialList(params).then((res) => {

src/views/basic_data/supplier/components/supplier_list-detail.vue

@@ -3,341 +3,454 @@
     <div class="sty">
       <el-page-header @back="goBack" content="详情页面"> </el-page-header>
     </div>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>供应商编码</span>
-      </div>
-      <el-row>
-        <el-col :span="6"
-          ><span class="color">创建组织</span
-          ><input type="text" v-model="infoForm.createOrgName"
-        /></el-col>
-        <el-col :span="6"
-          ><span>使用组织</span><input type="text" v-model="infoForm.useOrgId"
-        /></el-col>
-        <el-col :span="6"
-          ><span class="color">注册编码</span
-          ><input v-model="infoForm.regNumber" type="text"
-        /></el-col>
-        <el-col :span="6"
-          ><span class="color">编码</span
-          ><input v-model="infoForm.number" type="text"
-        /></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6"
-          ><span>名称</span><input v-model="infoForm.name" type="text"
-        /></el-col>
-        <el-col :span="6"
-          ><span>简称</span><input v-model="infoForm.shortName" type="text"
-        /></el-col>
-      </el-row>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>基本信息</span>
-      </div>
-      <div class="baseInfo">
+    <el-form
+      :model="infoList"
+      label-width="130px"
+      size="small"
+      label-position="right"
+    >
+      <el-card class="">
+        <div slot="header" class="clearfix">
+          <strong>供应商编码</strong>
+        </div>
         <div>
-          <div class="base-header">
-            <span>地址</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">国家</span
-              ><input v-model="infoForm.country" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">地区</span
-              ><input v-model="infoForm.provincial" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">通讯地址</span
-              ><textarea
-                v-model="infoForm.address"
-                name=""
-                id=""
-                cols="30"
-                rows="10"
-                class="textareaStyle"
-              ></textarea>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="创建组织" prop="">
+                <el-input
+                  v-model="infoList.createOrgName"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">邮政编码</span
-              ><input v-model="infoForm.zip" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">语言</span
-              ><input v-model="infoForm.language" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">公司地址</span
-              ><textarea
-                v-model="infoForm.webSite"
-                class="textareaStyle"
-                name=""
-                id=""
-                cols="30"
-                rows="10"
-              ></textarea>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="使用组织" prop="takerName">
+                <el-input
+                  v-model="infoList.useOrgName"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="注册编码" prop="telephone">
+                <el-input
+                  v-model="infoList.regNumber"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="编码" prop="telephone">
+                <el-input
+                  v-model="infoList.number"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="名称" prop="telephone">
+                <el-input
+                  v-model="infoList.name"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="简称" prop="telephone">
+                <el-input
+                  v-model="infoList.shortName"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
             </el-col>
           </el-row>
+          <!-- </el-form> -->
+        </div>
+      </el-card>
+      <br />
+      <el-card class="">
+        <div slot="header" class="clearfix">
+          <strong>基本信息</strong>
         </div>
+        <span>地址</span>
+        <el-divider></el-divider>
         <div>
-          <div class="base-header">
-            <span>注册</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">行业</span
-              ><input v-model="infoForm.trade" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">创立日期</span
-              ><input v-model="infoForm.foundDate" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">法人代表</span
-              ><input v-model="infoForm.legalPerson" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">注册资金(万元)</span
-              ><input v-model="infoForm.registerFund" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">公司规模工商登记号</span
-              ><input v-model="infoForm.registerCode" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">生产经许可证</span
-              ><input v-model="infoForm.tendPermit" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">统一社会信用代码</span
-              ><input v-model="infoForm.socialCreCode" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">注册地址</span
-              ><textarea
-                v-model="infoForm.registerAddress"
-                name=""
-                id=""
-                cols="30"
-                rows="10"
-                class="textareaStyle"
-              ></textarea>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="国家" prop="">
+                <el-input
+                  v-model="infoList.country"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="地区" prop="takerName">
+                <el-input
+                  v-model="infoList.provincial"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="通讯地址" prop="telephone">
+                <el-input
+                  v-model="infoList.address"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="邮政编码" prop="telephone">
+                <el-input
+                  v-model="infoList.zip"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="语言" prop="telephone">
+                <el-input
+                  v-model="infoList.language"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="公司网址" prop="telephone">
+                <el-input
+                  v-model="infoList.webSite"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
             </el-col>
           </el-row>
+          <!-- </el-form> -->
         </div>
+        <span>注册</span>
+        <el-divider></el-divider>
         <div>
-          <div class="base-header">
-            <span>管理</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">负责部门</span
-              ><input v-model="infoForm.deptName" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">负责人</span
-              ><input v-model="infoForm.staffName" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">供应商分类</span
-              ><input v-model="infoForm.supplierClassify" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">供应类别</span
-              ><select name="" id="" class="selectStyle">
-                <option value="">采购</option>
-              </select></el-col
-            >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">供应商等级</span
-              ><input v-model="infoForm.supplierGrade" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">供应商分组</span
-              ><input v-model="infoForm.groupName" type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">公司类别</span
-              ><input v-model="infoForm.companyClassify" type="text"
-            /></el-col>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="行业" prop="">
+                <el-input
+                  v-model="infoList.trade"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="创立日期" prop="takerName">
+                <el-date-picker
+                  v-model="infoList.foundDate"
+                  type="datetime"
+                  placeholder="选择日期时间"
+                  default-time="23:59:59"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="法人代表" prop="telephone">
+                <el-input
+                  v-model="infoList.legalPerson"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="注册资金" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="工商登记号" prop="telephone">
+                <el-input
+                  v-model="infoList.registerFund"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="生产经营许可证" prop="telephone">
+                <el-input
+                  v-model="infoList.tendPermit"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="统一社会信用代码" prop="telephone">
+                <el-input
+                  v-model="infoList.socialCrecode"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="注册地址" prop="telephone">
+                <el-input
+                  v-model="infoList.registerAddress"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">公司性质</span
-              ><input v-model="infoForm.companyNature" type="text"
-            /></el-col>
+          <!-- </el-form> -->
+        </div>
+        <span>管理</span>
+        <el-divider></el-divider>
+        <div>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="负责部门" prop="">
+                <el-input
+                  v-model="infoList.deptName"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="负责人" prop="takerName">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="供应商分类" prop="telephone">
+                <el-input
+                  v-model="infoList.supplierClassify"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="供应类别" prop="telephone">
+                <el-select
+                  v-model="infoList.supplyClassify"
+                  placeholder="请选择"
+                >
+                  <el-option> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="供应商等级" prop="telephone">
+                <el-input
+                  v-model="infoList.supplierGrade"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="供应商分组" prop="telephone">
+                <el-input
+                  v-model="infoList.groupName"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="公司类别" prop="telephone">
+                <el-input
+                  v-model="infoList.companyClassify"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="公司性质" prop="telephone">
+                <el-input
+                  v-model="infoList.companyNature"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="公司规模" prop="telephone">
+                <el-input
+                  v-model="infoList.companyScale"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="对应组织" prop="telephone">
+                <el-input
+                  v-model="infoList.correspondOrgName"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">公司规模</span
-              ><input v-model="infoForm.companyScale" type="text"
-            /></el-col>
+          <!-- </el-form> -->
+        </div>
+      </el-card>
+      <br />
+      <el-card class="">
+        <div slot="header" class="clearfix">
+          <strong>商务信息</strong>
+        </div>
+        <div>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="采购组" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="默认价目表" prop="takerName">
+                <el-input
+                  v-model="infoList.number"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="业务状态" prop="telephone">
+                <el-select v-model="infoList.useOrgName" placeholder="请选择">
+                  <el-option> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="默认折扣表" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="冻结范围" prop="telephone">
+                <el-select placeholder="请选择">
+                  <el-option> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="供货方" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="冻结人" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="VMI仓库" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="冻结日期" prop="telephone">
+                <el-date-picker
+                  type="datetime"
+                  placeholder="选择日期时间"
+                  default-time="23:59:59"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="VMI业务" prop="telephone">
+                <el-checkbox></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="启用供应商协同" prop="telephone">
+                <el-checkbox></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="汇总公司" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="保证金比例" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="默认联系人" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">对应组织</span
-              ><input v-model="infoForm.correspondOrgName" type="text"
-            /></el-col>
+          <!-- </el-form> -->
+        </div>
+      </el-card>
+      <br />
+      <el-card class="">
+        <div slot="header" class="clearfix">
+          <strong>财务信息</strong>
+        </div>
+        <div>
+          <!-- <el-form label-width="130px" size="small" label-position="right"> -->
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="对应客户" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="单次预付额度" prop="takerName">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发票类型" prop="telephone">
+                <el-select placeholder="请选择">
+                  <el-option> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="税分类" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="默认税率" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结算方式" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="描述" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="付款条件" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="经营类型" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="收款方" prop="telephone">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
+          <!-- </el-form> -->
         </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>商务信息</span>
-      </div>
-      <el-row>
-        <el-col :span="6"
-          ><span class="color">采购组</span><input type="text"
-        /></el-col>
-        <el-col :span="6"><span>默认价目表</span><input type="text" /></el-col>
-        <el-col :span="6"
-          ><span>业务状态</span
-          ><select name="" id="" class="selectStyle2">
-            <option value="">正常</option>
-          </select></el-col
-        >
-        <el-col :span="6"><span>默认折扣表</span><input type="text" /></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6"
-          ><span>冻结范围</span
-          ><select name="" id="" class="selectStyle2">
-            <option value=""></option></select
-        ></el-col>
-        <el-col :span="6"
-          ><span class="color">供货方</span><input type="text"
-        /></el-col>
-        <el-col :span="6"><span>冻结人</span><input type="text" /></el-col>
-        <el-col :span="6"
-          ><span class="color">VMI仓库</span><input type="text"
-        /></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6"
-          ><span>冻结日期</span><input type="date" class="inputDate"
-        /></el-col>
-        <el-col :span="6"><span>VMI业务</span><input type="checkbox" /></el-col>
-        <el-col :span="6"
-          ><span class="color">汇总公司</span><input type="text"
-        /></el-col>
-        <el-col :span="6"
-          ><span>启用供应商协同</span><input type="checkbox"
-        /></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6"><span>保证金比例</span><input type="text" /></el-col>
-        <el-col :span="6"
-          ><span class="color">默认联系人</span><input type="text"
-        /></el-col>
-        <el-col :span="6"></el-col>
-        <el-col :span="6"></el-col>
-      </el-row>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>财务信息</span>
-      </div>
-      <el-row>
-        <el-col :span="6"
-          ><span class="color">对应客户</span><input type="text"
-        /></el-col>
-        <el-col :span="6"
-          ><span>单次预付额度</span><input type="text"
-        /></el-col>
-        <el-col :span="6"
-          ><span class="color">发票类型</span
-          ><select name="" id="" class="selectStyle2">
-            <option value="">正常</option>
-          </select></el-col
-        >
-        <el-col :span="6"
-          ><span class="color">结算币别</span><input type="text"
-        /></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6"
-          ><span class="color">税分类</span><input type="text"
-        /></el-col>
-        <el-col :span="6"
-          ><span class="color">默认税率</span><input type="text"
-        /></el-col>
-        <el-col :span="6"
-          ><span class="color">结算方式</span><input type="text"
-        /></el-col>
-        <el-col :span="6"><span>税务登记号</span><input type="text" /></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6"
-          ><span>描述</span
-          ><textarea
-            class="textareaStyle"
-            name=""
-            id=""
-            cols="30"
-            rows="10"
-            style="width: 41%"
-          ></textarea>
-        </el-col>
-        <el-col :span="6"
-          ><span class="color">付款条件</span><input type="text"
-        /></el-col>
-        <el-col :span="6"
-          ><span class="color">经营类型</span><input type="text"
-        /></el-col>
-        <el-col :span="6"
-          ><span class="color">结算方</span><input type="text"
-        /></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6"
-          ><span class="color">收款方</span><input type="text"
-        /></el-col>
-        <el-col :span="6"></el-col>
-        <el-col :span="6"></el-col>
-        <el-col :span="6"></el-col>
-      </el-row>
-    </el-card>
+      </el-card>
+      <br />
+    </el-form>
   </div>
 </template>
 
@@ -350,58 +463,11 @@ export default {
     },
   },
   data() {
-    return {
-      infoForm: {
-        address: "",
-        auditName: "",
-        companyClassify: "",
-        companyNature: "",
-        companyScale: "",
-        correspondOrgName: "",
-        country: "",
-        createBy: "",
-        createOrgName: "",
-        createTime: "",
-        deptName: "",
-        forbidStatus: "",
-        foundDate: "",
-        groupName: "",
-        groupNumber: "",
-        id: "",
-        language: "",
-        legalPerson: "",
-        name: "",
-        number: "",
-        provincial: "",
-        regNumber: "",
-        registerAddress: "",
-        registerCode: "",
-        registerFund: 0,
-        shortName: "",
-        socialCreCode: "",
-        staffName: "",
-        supplierClassify: "",
-        supplierGrade: "",
-        supplyClassify: "",
-        syncTime: "",
-        tendPermit: "",
-        trade: "",
-        updateBy: "",
-        updateTime: "",
-        useOrgId: "",
-        useOrgName: "",
-        useOrgNumber: "",
-        webSite: "",
-        zip: "",
-      },
-    };
-  },
-  created() {
-    this.infoForm = this.infoList;
+    return {};
   },
+  created() {},
   methods: {
     goBack() {
-      console.log(this.$parent);
       this.$parent.isShow = true;
     },
   },
@@ -409,76 +475,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.baseWidth {
-  width: 46%;
-}
-.inputDate {
-  width: 41%;
-}
-.selectStyle2 {
-  width: 41%;
-}
-.selectStyle {
-  width: 31%;
-}
-
-.textareaStyle {
-  vertical-align: text-top;
-  resize: none;
-  width: 31%;
-  height: 100px;
-}
-.color {
-  color: #1f93ec;
-}
-.el-col-24 {
-  margin: 6px 0;
-}
-
-.marg-r {
-  padding-right: 15px;
-  font-size: 12px;
-  display: inline-block;
-  width: 120px;
-}
-.base-header {
-  height: 20px;
-  width: 60%;
-  border-bottom: 2px solid gray;
-  span {
-    width: 100px;
-    height: 100%;
-    display: block;
-    text-align: center;
-    color: #fff;
-
-    background-color: gray;
-  }
-}
-.box-card {
-  margin-bottom: 20px;
+::v-deep .el-date-editor--datetime {
+  width: 100%;
 }
-.el-col-6 {
-  span {
-    padding-right: 10px;
-    display: inline-block;
-    width: 100px;
-  }
-}
-.baseInfo {
-  display: flex;
-  justify-content: space-between;
-  > div {
-    width: 33%;
-  }
+::v-deep .el-select {
+  width: 100%;
 }
 .sty {
   margin-bottom: 20px;
 }
-.el-row {
-  margin-bottom: 20px;
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
 </style>

src/views/basic_data/taker/taker_car.vue

@@ -249,7 +249,7 @@ export default {
       },
       rules: {
         customerId: [
-          { required: true, message: "请选择活动区域", trigger: "change" },
+          { required: true, message: "请选择活动区域", trigger: "blur" },
         ],
         mobile: [
           {
@@ -304,6 +304,13 @@ export default {
     },
     //取消
     async cancelFn() {
+      this.addForm = {
+        customerId: "",
+        mobile: "",
+        carType: "",
+        volume: "",
+        carBrand: "",
+      };
       await this.$refs.addForm.resetFields();
       this.dialogForm = false;
     },
@@ -342,6 +349,13 @@ export default {
     },
     //新增
     addDataList() {
+      this.addForm = {
+        customerId: "",
+        mobile: "",
+        carType: "",
+        volume: "",
+        carBrand: "",
+      };
       this.dialogForm = true;
       this.getDealerDataList({ pageNum: 1, pageSize: 10 });
     },

src/views/basic_data/taker/taker_list.vue

@@ -107,13 +107,6 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            label="附件"
-            prop="attach"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
             label="有效期"
             prop="expireTime"
             min-width="160"
@@ -155,13 +148,34 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope"
-              ><el-button type="text" class="textColor">查看</el-button>
+              ><el-button
+                type="text"
+                class="textColor"
+                @click="seeFn(scope.row)"
+                >查看</el-button
+              >
+              <el-popconfirm
+                @onConfirm="deleFn(scope.row.id)"
+                title="这是一段内容确定删除吗？"
+              >
+                <el-button type="text" class="textColor" slot="reference"
+                  >删除</el-button
+                >
+              </el-popconfirm>
               <el-button
                 type="text"
                 class="textColor"
                 @click="stopFn(scope.row.id)"
+                v-if="scope.row.flag === 1"
                 >停用</el-button
               >
+              <el-button
+                type="text"
+                class="textColor"
+                @click="rebuild(scope.row)"
+                v-else-if="scope.row.flag === 2"
+                >重建</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -253,15 +267,15 @@
             </el-form-item></el-col
           >
         </el-row>
-        <!-- <el-form-item label="上传提货人附件">
-          <el-upload action="#" class="upload-demo" :on-success="handlefile">
-            <el-button size="small" type="info">点击上传</el-button>
-          </el-upload>
-        </el-form-item> -->
+        <el-form-item label="上传提货人附件" prop="fileUrl">
+          <fileUpload :fileList="fileList" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelFn">取 消</el-button>
-        <el-button type="primary" @click="addDataFn">确 定</el-button>
+        <el-button v-if="showOK" type="primary" @click="addDataFn"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -273,12 +287,19 @@ import {
   addDataList,
   getCodeApi,
   stopTaker,
+  deleDataList,
 } from "@/api/basic_data/taker";
 import { getDealerList } from "@/api/basic_data/dealer";
 import { downloadFiles } from "@/utils/util";
+import fileUpload from "@/components/Common/file-upload.vue";
 export default {
+  components: {
+    fileUpload,
+  },
   data() {
     return {
+      baseURL: process.env.VUE_APP_BASE_API,
+      fileList: [],
       listLoading: false, // 列表加载loading
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
@@ -293,9 +314,10 @@ export default {
         expireTime: "",
         code: "",
       },
+
       rules: {
         customerId: [
-          { required: true, message: "请选择经销商", trigger: "change" },
+          { required: true, message: "请选择经销商", trigger: "blur" },
         ],
         takerName: [
           { required: true, message: "请输入提货人姓名", trigger: "blur" },
@@ -351,6 +373,8 @@ export default {
         telephone: "",
       },
       dealerList: [],
+      id: "", //重建之前的Id
+      showOK: true,
     };
   },
   async created() {
@@ -358,11 +382,49 @@ export default {
     await this.getDealerDataList({ pageNum: 1, pageSize: 10 });
   },
   methods: {
-    changFn(v) {
-      console.log(v);
+    //重建
+    rebuild(data) {
+      this.showOK = true;
+      this.id = data.id;
+      this.addForm = {
+        customerId: data.customerId,
+        takerName: data.takerName,
+        identity: data.identity,
+        phone: data.phone,
+
+        sparePhone: data.sparePhone,
+        expireTime: "",
+        code: "",
+      };
+      this.fileList = [];
+      this.dialogForm = true;
+    },
+    //删除
+    async deleFn(ids) {
+      await deleDataList({ ids });
+      this.$message.success("删除成功");
+      this.getDataList({ pageNum: 1, pageSize: 10 });
     },
+    //查看
+    seeFn(data) {
+      this.showOK = false;
+      this.addForm = data;
+      this.fileList = [];
+      this.dialogForm = true;
+    },
+
     //取消
     cancelFn() {
+      this.addForm = {
+        customerId: "",
+        takerName: "",
+        identity: "",
+        phone: "",
+
+        sparePhone: "",
+        expireTime: "",
+        code: "",
+      };
       this.$refs.addForm.resetFields();
       this.dialogForm = false;
     },
@@ -425,19 +487,65 @@ export default {
     },
     //新增
     async addDataFn() {
+      console.log(this.fileList);
+
       await this.$refs.addForm.validate();
 
       const res = this.dealerList.filter(
         (v) => v.id === this.addForm.customerId
       )[0];
       console.log(res);
-      await addDataList({ ...this.addForm, orgNumber: res.useOrgNumber });
+
+      if (this.fileList.length == 1) {
+        await addDataList({
+          ...this.addForm,
+          orgNumber: res.useOrgNumber,
+
+          fileName: this.fileList[0].name,
+          fileUrl: this.fileList[0].url,
+        });
+      } else {
+        await addDataList({
+          ...this.addForm,
+          orgNumber: res.useOrgNumber,
+
+          fileName: "",
+          fileUrl: "",
+        });
+      }
+
+      if (this.id) {
+        await deleDataList({ ids: this.id });
+      }
+
       this.$message.success("新增成功");
-      this.$refs.addForm.resetFields();
+      this.id = "";
+      // this.addForm = {
+      //   customerId: "",
+      //   takerName: "",
+      //   identity: "",
+      //   phone: "",
+
+      //   sparePhone: "",
+      //   expireTime: "",
+      //   code: "",
+      // };
       this.getDataList({ pageNum: 1, pageSize: 10 });
       this.dialogForm = false;
     },
     addFn() {
+      this.addForm = {
+        customerId: "",
+        takerName: "",
+        identity: "",
+        phone: "",
+
+        sparePhone: "",
+        expireTime: "",
+        code: "",
+      };
+      this.fileList = [];
+      this.showOK = true;
       this.dialogForm = true;
     },
   },

src/views/basic_data/warehouse/warehouse_book.vue

@@ -45,7 +45,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.number"></el-input>
+              <el-input v-model="scope.row.number" :disabled="scope.row.isDisabled"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -56,7 +56,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.towerNum"></el-input>
+              <el-input v-model="scope.row.towerNum" :disabled="scope.row.isDisabled"></el-input>
             </template>
           </el-table-column>
 
@@ -64,12 +64,15 @@
             align="center"
             label="操作"
             min-width="160"
+
             show-overflow-tooltip
           >
-            <el-button type="text" class="textColor" @click="editFn"
+          <template slot-scope="scope">
+            <el-button type="text" class="textColor" @click="hanleEidt(scope.$index)"
               >编辑</el-button
             >
-            <el-button type="text" class="textColor">删除</el-button>
+            <el-button type="text" class="textColor" @click="hanleSave(scope.row)">保存</el-button>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -79,7 +82,7 @@
 
 <script>
 import Mixin from "@/mixin/index";
-import { getListReserve } from "@/api/basic_data/warehouse";
+import { getListReserve,addReserve } from "@/api/basic_data/warehouse";
 export default {
   mixins: [Mixin],
   data() {
@@ -114,12 +117,30 @@ export default {
           maxSets: "",
         },
       ],
+      index:0
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    hanleEidt(i){
+      this.dataList.forEach(e=>{
+        e.isDisabled = true
+      })
+      this.dataList[i].isDisabled = false
+    },
+    hanleSave(edata){
+      const params = {
+        ...edata
+      }
+    addReserve(params).then(res=>{
+       this.$successMsg("保存成功");
+       this.dataList.forEach(e=>{
+        e.isDisabled = true
+      })
+    })
+    },
     getList() {
       this.listLoading = true;
       let params = {
@@ -127,6 +148,9 @@ export default {
         pageSize: this.pageSize,
       };
       getListReserve(params).then((res) => {
+          res.data.records.forEach(el => {
+              el.isDisabled=true
+          });
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -67,30 +67,17 @@
         <el-button
           type="primary"
           size="small"
-          @click="
-            () => {
-              (showDialog = true), (type = 1);
-            }
-          "
+          @click="(showDialog = true), (type = 1)"
           >新增</el-button
         >
-        <el-button
-          type="primary"
-          size="small"
-          @click="
-            () => {
-              (showDialog = true), (type = 2);
-            }
-          "
-          >编辑</el-button
-        >
+
         <el-popconfirm
           confirm-button-text="好的"
           cancel-button-text="不用了"
           icon="el-icon-info"
           icon-color="red"
           title="内容确定删除吗？"
-          @onConfirm="hanleDeleteAll"
+          @onConfirm="hanleDelete"
         >
           <el-button
             type="primary"
@@ -248,44 +235,53 @@
       :close-on-click-modal="false"
     >
       <el-form :model="dialogForm" label-width="100px" label-position="right">
-        <el-form-item label="经销商编码">
+        <el-form-item label="经销商编码" prop="customerNumber">
           <el-select
             v-model="dialogForm.customerNumber"
             placeholder="请选择活动区域"
             class="inputStyle"
-            v-el-select-loadmore="loadMore"
+            v-el-select-loadmore="loadmore"
           >
+            <!-- v-el-select-loadmore="loadMore" -->
             <el-option
-              v-for="item in customerList"
-              :key="item.id"
+              v-for="(item, index) in customerList"
+              :key="index"
               :label="item.number"
               :value="item.id"
             ></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="经销商名称">
+        <el-form-item label="经销商名称" prop="customerName">
           <el-input
             v-model="dialogForm.customerName"
             class="inputStyle"
           ></el-input>
         </el-form-item>
-        <el-form-item label="仓库存放" class="sty">
+        <el-form-item label="仓库存放" class="sty" prop="freeDay">
           <el-input
+            type="number"
             v-model="dialogForm.freeDay"
             class="inputStyle"
           />天内可免费受存储管理费用. 当超过
           <el-input
+            type="number"
             v-model="dialogForm.freeDay"
             class="inputStyle"
           />天后,按每立方米
-          <el-input v-model="dialogForm.toll" class="inputStyle" />
+          <el-input
+            v-model="dialogForm.toll"
+            type="number"
+            class="inputStyle"
+          />
           元/天计算
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="showDialog = false">取 消</el-button>
-        <el-button type="primary" @click="hanleInfo">确 定</el-button>
+        <el-button @click="(showDialog = false), kong()">取 消</el-button>
+        <el-button type="primary" @click="hanleInfo(dialogForm)"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -294,7 +290,6 @@
 <script>
 import Mixin from "@/mixin/index";
 import { downloadFiles, handleImport } from "@/utils/util";
-
 import {
   getListToll,
   getDetail,
@@ -307,22 +302,26 @@ export default {
   mixins: [Mixin],
   data() {
     return {
+      dialogForm: {
+        id: null,
+        customerName: "",
+        customerNumber: "",
+        freeDay: 0,
+        toll: 0,
+      },
       sleectBox: {
         currentPage: 1, // 当前页码
         pageSize: 10, // 每页数量
         listTotal: 0, // 列表总数
       },
+      baseURL: "",
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       importLoading: false, // 导入加载loading
       importFileList: [], // 导入列表
-      dialogForm: {
-        customerName: "",
-        customerNumber: "",
-        freeDay: 0,
-        toll: 0,
-      },
+
+      customerList: [],
       showDialog: false,
       dataList: [],
       screenForm: {
@@ -355,7 +354,7 @@ export default {
           const condition =
             this.scrollHeight - this.scrollTop <= this.clientHeight;
           if (condition) {
-            console.log("到底", binding);
+            binding.value();
           }
         });
       },
@@ -363,33 +362,37 @@ export default {
   },
   methods: {
     editFn(id, row) {
-      this.type = 2;
-      this.diaLogForm = {
-        id,
+      (this.dialogForm = {
+        id: id,
         customerName: row.customerName,
         customerNumber: row.customerNumber,
         freeDay: row.freeDay,
         toll: row.toll,
-      };
+      }),
+        (this.type = 2);
       this.showDialog = true;
     },
-    hanleInfo() {
+    hanleInfo(dialogForm) {
       if (this.type === 1) {
-        addToll(this.diaLogForm).then((res) => {
+        const params = {
+          ...dialogForm,
+        };
+        console.log(params, 78798);
+        addToll(params).then((res) => {
           this.$successMsg("保存成功");
-          console.log(params, 123);
+          this.kong();
           this.getList();
         });
       } else if (this.type === 2) {
-        const params = {
-          ...this.diaLogForm,
+        const paramss = {
+          ...this.dialogForm,
         };
-        console.log(params, 123);
-        updateToll(params).then((res) => {
+        updateToll(paramss).then((res) => {
           this.$successMsg("编辑成功");
+          this.kong();
+          this.diaLogForm.id = null;
           this.getList();
         });
-        this.diaLogForm.id = null;
       }
       this.showDialog = false;
     },
@@ -410,7 +413,6 @@ export default {
     },
     loadmore() {
       this.sleectBox.currentPage++;
-      console.log(1233);
       this.getCustomerList();
     },
     getCustomerList() {
@@ -420,15 +422,17 @@ export default {
         keyword: "",
       };
       getCustomerList(params).then((res) => {
-        this.customerList = res.data.records;
+        if (res.data.records.length) {
+            this.customerList = [...this.customerList, ...res.data.records];
+        }
         // this.listTotal = res.data.total;
       });
     },
-    hanleDetail(detail) {
-      this.type = null;
-      this.showDialogForm = true;
-      this.diaLogForm = detail;
-    },
+    // hanleDetail(detail) {
+    //   this.type = null;
+    //   this.showDialog = true;
+    //   this.diaLogForm = detail;
+    // },
 
     handleExport() {
       let screenData = {
@@ -466,6 +470,14 @@ export default {
         });
       }
     },
+    kong() {
+      this.dialogForm = {
+        customerName: "",
+        customerNumber: "",
+        freeDay: 0,
+        toll: 0,
+      };
+    },
   },
 };
 </script>

src/views/basic_data/warehouse/warehouse_list.vue

@@ -43,11 +43,11 @@
             highlight-current-row
             stripe
           >
-            <el-table-column
+            <!-- <el-table-column
               type="selection"
               align="center"
               min-width="100"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               align="center"
               label="编码"