Merge branch 'feature/Feature-sales' of https://gogs.zfire.top/zfire-front/supply-front into feature/Feature-sales

src/api/supply/pickup.js

@@ -115,4 +115,13 @@ export function getStatistics(params) {
     method: 'get',
     params
   })
+}
+
+// 验证密码
+export function checkPassword(params) {
+  return request({
+    url: '/pick/verifyShip',
+    method: 'post',
+    params
+  })
 }

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

@@ -18,28 +18,22 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="创建组织" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="客户编码" prop="">
-                <el-input
-                  v-model="infoList.number"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.number"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用组织" prop="">
-                <el-input
-                  v-model="infoList.useOrgName"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.useOrgName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="简称" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -58,59 +52,47 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="国家" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="地区" prop="">
-                <el-input
-                  v-model="infoList.region"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.region"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="省份" prop="">
-                <el-input
-                  v-model="infoList.province"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.province"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="城市" prop="">
-                <el-input
-                  v-model="infoList.city"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.city"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="通信地址" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="邮政编码" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="公司网址" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="商城订单对应组织" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="联系邮箱" prop="">
-                <el-input
-                  v-model="infoList.email"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.email"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -123,30 +105,27 @@
           <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-input v-model="infoList.mobile"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="传真" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="公司类别" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="公司性质" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="公司规模" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -159,22 +138,22 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="对应供应商" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="对应集团客户" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="客户类别" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="客户分组" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -194,12 +173,12 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="对应组织" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="备注" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -212,44 +191,32 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="发票抬头" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="纳税登记号" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开户银行" prop="">
-                <el-input
-                  v-model="infoList.bank"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.bank"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="银行账号" prop="">
-                <el-input
-                  v-model="infoList.bankAccount"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.bankAccount"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开票联系电话" prop="">
-                <el-input
-                  v-model="infoList.invoicePhone"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.invoicePhone"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开票通讯地址" prop="">
-                <el-input
-                  v-model="infoList.invoiceAddress"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.invoiceAddress"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -276,18 +243,54 @@
         <strong>信用额度</strong>
       </div>
       <div class="diy-table-1">
-        <el-row :gutter="0">
-          <el-col :span="12" class="item">
-            <div class="label">审批人</div>
-            <div class="value">{{}}</div>
-          </el-col>
-          <el-col :span="12" class="item">
-            <div class="label">审批人</div>
-            <div class="value">{{}}</div>
-          </el-col>
+        <el-row :gutter="0" class="xyed">
+          <div v-for="(v, i) in infoList.customerWallets" :key="i">
+            <el-col :span="12" class="item">
+              <div class="label">信用额度</div>
+              <div class="value">{{ v.freeCreditAmount }}</div>
+            </el-col>
+            <el-col :span="12" class="item">
+              <div class="label">钱包类型</div>
+              <div class="value">
+                {{ v.customerWalletName }}-{{
+                  v.type == "COMMONLY" ? "普通钱包" : "返利钱包"
+                }}
+              </div>
+            </el-col>
+          </div>
         </el-row>
       </div>
     </el-card>
+    <br />
+    <el-card>
+      <div slot="header" class="clearfix">
+        <strong>标签信息</strong>
+      </div>
+      <div class="diy-table-1">
+        <el-form label-width="120px" class="demo-ruleForm">
+          <el-form-item label="集团客户" prop="">
+            <el-radio v-model="infoList.isGroupCompany" :label="true"
+              >是</el-radio
+            >
+            <el-radio v-model="infoList.isGroupCompany" :label="false"
+              >否</el-radio
+            >
+          </el-form-item>
+          <el-form-item label="分子公司" prop="">
+            <el-tag
+              class="tagStyle"
+              v-for="v in infoList.kingDeeCustomers"
+              :key="v.id"
+              >{{ v.name }}</el-tag
+            >
+          </el-form-item>
+          <el-form-item label="是否可转折让" prop="">
+            <el-radio v-model="infoList.isZr" :label="true">是</el-radio>
+            <el-radio v-model="infoList.isZr" :label="false">否</el-radio>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
   </div>
 </template>
 
@@ -315,4 +318,16 @@ export default {
 .sty {
   margin-bottom: 20px;
 }
+::v-deep .diy-table-1 {
+  width: 50%;
+  .xyed {
+    border-top: 1px solid #ebeef5;
+    .item {
+      margin-bottom: 18px;
+    }
+  }
+}
+.tagStyle {
+  margin: 0 18px;
+}
 </style>

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

@@ -18,50 +18,32 @@
           <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-input v-model="infoList.createOrgName"></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.useOrgName"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.useOrgName"></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-input v-model="infoList.regNumber"></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-input v-model="infoList.number"></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-input v-model="infoList.name"></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-input v-model="infoList.shortName"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -80,50 +62,32 @@
           <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-input v-model="infoList.country"></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-input v-model="infoList.provincial"></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-input v-model="infoList.address"></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-input v-model="infoList.zip"></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-input v-model="infoList.language"></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-input v-model="infoList.webSite"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -136,10 +100,7 @@
           <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-input v-model="infoList.trade"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -156,50 +117,32 @@
             </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-input v-model="infoList.legalPerson"></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-input v-model="infoList.registerFund"></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-input v-model="infoList.registerFund"></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-input v-model="infoList.tendPermit"></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-input v-model="infoList.socialCrecode"></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-input v-model="infoList.registerAddress"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -212,82 +155,52 @@
           <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-input v-model="infoList.deptName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="负责人" prop="">
-                <el-input
-                  v-model="infoList.staffName"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.staffName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="供应商分类" prop="">
-                <el-input
-                  v-model="infoList.supplierClassify"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.supplierClassify"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="供应类别" prop="">
-                <el-input
-                  v-model="infoList.supplyClassify"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.supplyClassify"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="供应商等级" prop="">
-                <el-input
-                  v-model="infoList.supplierGrade"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.supplierGrade"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="供应商分组" prop="">
-                <el-input
-                  v-model="infoList.groupName"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.groupName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="公司类别" prop="">
-                <el-input
-                  v-model="infoList.companyClassify"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.companyClassify"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="公司性质" prop="">
-                <el-input
-                  v-model="infoList.companyNature"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.companyNature"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="公司规模" prop="">
-                <el-input
-                  v-model="infoList.companyScale"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.companyScale"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="对应组织" prop="">
-                <el-input
-                  v-model="infoList.correspondOrgName"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="infoList.correspondOrgName"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -304,42 +217,42 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="采购组" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="默认价目表" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务状态" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="默认折扣表" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="冻结范围" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="供货方" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="冻结人" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="VMI仓库" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -365,17 +278,17 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="汇总公司" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="保证金比例" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="默认联系人" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -392,52 +305,52 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="对应客户" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单次预付额度" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="发票类型" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="税分类" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="默认税率" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结算方式" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="描述" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="付款条件" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经营类型" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="收款方" prop="">
-                <el-input placeholder="请输入"></el-input>
+                <el-input></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -479,4 +392,4 @@ export default {
 .sty {
   margin-bottom: 20px;
 }
-</style>
+</style>

src/views/login/index.vue

@@ -425,7 +425,7 @@ $back: #333;
       color: $back;
       height: 47px;
       caret-color: $back;
-      // border-bottom: 1px solid #eaeaea;
+      border-bottom: none !important;
       &:-webkit-autofill {
         box-shadow: 0 0 0px 1000px $cursor inset !important;
         -webkit-text-fill-color: $back !important;
@@ -480,6 +480,9 @@ $back: #333;
       top: 50%;
       transform: translate(-50%, -50%);
     }
+    .el-checkbox {
+      margin: 0 !important;
+    }
   }
   /* 可以设置不同的进入和离开动画 */
   /* 设置持续时间和动画函数 */
@@ -499,7 +502,7 @@ $back: #333;
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    margin-top: 35px;
+    margin-top: 30px;
     text-align: center;
     text-align-last: center;
     &-item-tip {
@@ -543,22 +546,17 @@ $light_gray: #eee;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  padding: 0 30px;
+  margin: 0 30px;
   cursor: pointer;
   font-size: 24px;
   color: #666666;
+  line-height: 40px;
+  border-bottom: 3px solid #FFFFFF;
 }
 .acitve {
   font-weight: bold;
   color: #4684f4;
-}
-.acitve::after {
-  display: block;
-  content: "";
-  margin-top: 7.5px;
-  width: 115px;
-  height: 3px;
-  background-color: #4684f4;
+  border-bottom: 3px solid #4684f4;
 }
 .flexBox {
   display: flex;
@@ -573,7 +571,7 @@ $light_gray: #eee;
   height: 50px;
   margin-bottom: 20px;
   background: #ffffff;
-  border: 1px solid #e6e6e6;
+  border: 1px solid #e6e6e6 !important;
   border-radius: 4px;
 }
 .input-box:last-child {
@@ -630,7 +628,6 @@ $light_gray: #eee;
         letter-spacing: 4px;
         text-align: center;
         margin-bottom: 35px;
-        padding: 10px 0 0 0;
       }
     }
   }

src/views/merchant/merchant_list.vue

@@ -284,7 +284,7 @@ export default {
     exParams() {
       return {
         userName: this.screenForm.account,
-        nickName: this.screenForm.nickName,
+        nickName: this.screenForm.nickname,
         linkPhone: this.screenForm.phone,
         email: this.screenForm.email,
         status: this.screenForm.status,
@@ -400,7 +400,7 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         userName: this.screenForm.account,
-        nickName: this.screenForm.nickName,
+        nickName: this.screenForm.nickname,
         linkPhone: this.screenForm.phone,
         email: this.screenForm.email,
         status: this.screenForm.status,

src/views/setting/account.vue

@@ -159,8 +159,8 @@
         </el-form-item>
         <el-form-item label="集团公司" prop="isGroup" v-show="roleObj.type === 0 && roleObj.name === '经销商'">
           <el-radio-group v-model="AccountForm.isGroup">
-            <el-radio :label="false">否</el-radio>
             <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="所属集团" prop="company" v-show="roleObj.type === 0 && roleObj.name === '经销商' && !AccountForm.isGroup">
@@ -168,6 +168,12 @@
             <el-option :label="item.name" :value="item.id" v-for="(item, index) in dealerList" :key="index"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否折让" prop="isDiscount" v-show="roleObj.type === 0 && roleObj.name === '经销商'">
+          <el-radio-group v-model="AccountForm.isDiscount">
+            <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="密码" prop="newPassword">
           <el-input v-model="AccountForm.newPassword" ref="password1" autocomplete="off" placeholder="请输入密码" :type="passwordType1"></el-input>
           <span class="show-pwd" @click="showPwd(1)">
@@ -285,6 +291,7 @@ export default {
         role: '', // 角色组
         isGroup: false,
         company: '',
+        isDiscount: true,
         newPassword: '', // 新密码
         confirmPassword: '', // 确认密码
       },
@@ -521,6 +528,7 @@ export default {
           this.AccountForm.dealer = res.data.customerId;
           this.AccountForm.isGroup = res.data.isGroupCompany;
           this.AccountForm.company = res.data.parentCustomerId;
+          this.AccountForm.isDiscount = res.data.isZr;
           this.$refs.tree.setCheckedKeys(res.data.adminWebsitIds || []);
         })
       }
@@ -550,6 +558,7 @@ export default {
               params.customerId = this.AccountForm.dealer;
               params.isGroupCompany = this.AccountForm.isGroup;
               params.parentCustomerId = this.AccountForm.company;
+              params.isZr = this.AccountForm.isDiscount;
             }
           }else {
             params.adminCompanyId = this.AccountForm.merchant;

src/views/setting/role.vue

@@ -66,7 +66,7 @@
       <el-tree
         :data="menuRoleList"
         show-checkbox
-        :check-strictly="false"
+        :check-strictly="true"
         :default-expand-all="true"
         node-key="moduleId"
         ref="tree"

src/views/supply/apply/apply_list.vue

@@ -73,7 +73,7 @@
             <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'invoice/listExport'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">

src/views/supply/apply/components/engin_detail.vue

@@ -121,7 +121,7 @@
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售订单号" prop="enginOrderNo" min-width="180" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/apply/components/engin_examine.vue

@@ -129,7 +129,7 @@
         </el-table-column>
         <el-table-column align="center" label="库存数" prop="stockNumber" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售订单号" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售订单号" prop="enginOrderNo" min-width="180" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/apply/engin_list.vue

@@ -73,7 +73,7 @@
             <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'invoice/listProjectExport'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">

src/views/supply/deliver/home_list.vue

@@ -87,10 +87,6 @@
             <el-table-column align="center" label="无税单价" prop="afterTaxPrice" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审单人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审单日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.examineStatus | statusFilter}}

src/views/supply/engin/components/commerce_form.vue

@@ -529,6 +529,7 @@ export default {
         enginInfoNo: this.screenForm.enginNum,
         projectName: this.screenForm.enginName,
         useUnit: this.screenForm.company,
+        examineStatus: 'OK'
       }).then(res => {
         this.dialogTable_dataList = res.data.records;
         this.dialogTable_listTotal = res.data.total;
@@ -567,7 +568,7 @@ export default {
       getComLoginDetail({id}).then(res => {
         this.isShowDialog = false;
         let data = res.data;
-        this.mainForm.type = data.productCategoryId;
+        this.mainForm.type = data.mainId;
         this.mainForm.enginNum = data.enginInfoNo;
         this.mainForm.enginName = data.projectName;
         this.mainForm.loginType = data.enginSignType;

src/views/supply/engin/components/engin_examine.vue

@@ -124,7 +124,7 @@
             <el-select v-model="scope.row.materialNumber" placeholder="选择产品" size="small" @change="changeGoods(scope.$index)">
               <el-option
                 v-for="item in retailProductList"
-                :key="item.number"
+                :key="item.id"
                 :label="item.name"
                 :value="item.number">
               </el-option>
@@ -332,7 +332,7 @@ export default {
       this.formLoading = true;
       examineEngin({
         enginInfoId: this.listItem.enginInfoId,
-        productCategoryId: this.listItem.productCategoryId,
+        mainId: this.listItem.mainId,
         examineResult: this.examineForm.examineResult,
         examineNote: this.examineForm.remark,
         contractExpireDate: this.detailData.contractExpireDate,

src/views/supply/engin/components/home_form.vue

@@ -366,6 +366,7 @@ export default {
         createMan: '',
         createDate: '',
         fileNum: '',
+        loginUserId: ''
       },
       mainFormRules: {
         orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -549,6 +550,7 @@ export default {
         recordNo: this.screenForm.loginNum,
         projectName: this.screenForm.enginName,
         useUnit: this.screenForm.company,
+        examineStatus: 'OK'
       }).then(res => {
         this.dialogTable_dataList = res.data.records;
         this.dialogTable_listTotal = res.data.total;
@@ -588,6 +590,7 @@ export default {
         this.isShowDialog = false;
         let data = res.data;
         this.mainForm.type = data.productCategory;
+        this.mainForm.loginUserId = data.userid
         this.mainForm.saleType = '';
         this.mainForm.loginNum = data.recordNo;
         this.mainForm.enginName = data.projectName;
@@ -711,6 +714,7 @@ export default {
             enginOrderId: this.mainForm.orderNum,
             orderDate: this.mainForm.orderDate,
             mainId: this.mainForm.type || '',
+            loginUserId: this.mainForm.loginUserId,
             refEnginRecordNo: this.mainForm.loginNum || '',
             refFactoryNo: this.mainForm.factoryNum || '',
             saleTypeId: this.mainForm.saleType,

src/views/supply/engin/engin_list.vue

@@ -83,7 +83,7 @@
             <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'engin-info-order/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">

src/views/supply/engin/home_list.vue

@@ -328,6 +328,9 @@ export default {
 
     // 进入退订
     toReturn(item) {
+      if(item.refundableQty <= 0) {
+        return this.$errorMsg('可退数量为0');
+      }
       this.queryItem = item;
       this.isShowReturn = true;
     },

src/views/supply/implement/implement_list.vue

@@ -83,7 +83,7 @@
             <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" 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="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/pickup/check.vue

@@ -43,10 +43,9 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item prop="orderNum" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium">
-                  <el-radio-button label="0">未打印</el-radio-button>
-                  <el-radio-button label="1">已打印</el-radio-button>
+              <el-form-item prop="status" label-width="0">
+                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -61,7 +60,12 @@
       <div class="mymain-container">
         <div class="table">
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange">
-            <el-table-column align="center" type="selection" width="55"></el-table-column>
+            <!-- <el-table-column align="center" type="selection" width="55"></el-table-column> -->
+            <el-table-column align="center" label="操作" width="100" fixed="left">
+              <template slot-scope="scope">
+                <el-button type="text" @click="toPrint(scope.row)">打印</el-button>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="状态" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.printNum ? '已打单(' + scope.row.printNum + ')' : '未打单' }}
@@ -79,7 +83,7 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="发货申请单号" prop="invoiceOrderId" min-width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="发货申请单号" prop="invoiceId" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品大类" prop="mainName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
@@ -119,21 +123,54 @@
         </div>
       </div>
 
-      <div class="page-footer">
-        <div class="footer" :class="classObj">
-          <el-button type="primary" @click="printData" :disabled="multipleSelection.length < 1">打印发货单</el-button>
+      <!-- <div class="page-footer">
+        <div class="footer">
+          <el-button type="primary" @click="toPrint" :disabled="multipleSelection.length < 1">打印发货单</el-button>
         </div>
-      </div>
+      </div> -->
 
     </div>
 
+    <el-dialog title="密码确认" :visible.sync="isShowDialog" :show-close="false" width="40%" :close-on-click-modal="false">
+      <el-form ref="dialogForm" :model="dialogForm" :rules="dialogFormRules" label-position="right" label-width="70px">
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="24" :lg="24">
+            <el-form-item label="密码" prop="password">
+              <el-input v-model="dialogForm.password" autocomplete="off" placeholder="请输入密码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12">
+            <el-form-item label="操作人" prop="createMan">
+              <el-input v-model="dialogForm.createMan" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" style="height: 51px;">
+            <el-form-item label="操作日期" prop="createDate">
+              <el-date-picker
+                v-model="dialogForm.createDate"
+                readonly
+                type="date"
+                value-format="yyyy-MM-dd"
+                style="width: 100%;"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelDialogForm">取 消</el-button>
+        <el-button type="primary" @click="submitDialogForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
     <PickupPrint :listItem="queryItem" v-if="isShowPrint" @backListFormDetail="backList" />
 
   </div>
 </template>
 
 <script>
-import { getPickupList, getCode, getPickupManInfo, addPrint } from "@/api/supply/pickup";
+import { getPickupList, getCode, getPickupManInfo, checkPassword } from "@/api/supply/pickup";
 import PickupPrint from "@/views/supply/pickup/components/pickup_print";
 
 export default {
@@ -152,10 +189,13 @@ export default {
         code: '',
         name: '',
         idCard: '',
-        pickupWay: '',
-        company: '',
-        secretKey: '',
+        manId: '',
+        status: 0,
       },
+      statusList: [
+        { label: '未打单', value: 0 },
+        { label: '已打单', value: 1 },
+      ],
 
       getCodeText: '获取验证码',
       countDown: 60,
@@ -165,6 +205,18 @@ export default {
 
       queryItem: {},
       isShowPrint: false,
+
+      isShowDialog: false,
+      dialogForm: {
+        password: '',
+        createMan: '',
+        createDate: '',
+      },
+      dialogFormRules: {
+        password: [
+          { required: true, message: '请输入密码', trigger: 'blur' }
+        ],
+      },
     }
   },
 
@@ -177,13 +229,20 @@ export default {
   },
 
   methods: {
-    // 查询按钮权限
-    checkBtnRole(value) {
-      // let btnRole = this.$route.meta.roles;
-      // if(!btnRole) {return true}
-      // let index = btnRole.indexOf(value);
-      // return index >= 0;
-      return true
+    getDate() {
+      var date = new Date();
+      var seperator1 = "-";
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+          month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+          strDate = "0" + strDate;
+      }
+      var currentdate = year + seperator1 + month + seperator1 + strDate;
+      return currentdate;
     },
 
     // 获取短信验证码
@@ -211,6 +270,7 @@ export default {
         this.$successMsg('验证成功');
         this.screenForm.name = res.data.takerName;
         this.screenForm.idCard = res.data.identity;
+        this.screenForm.manId = res.data.id;
       })
     },
 
@@ -221,10 +281,7 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        userName: this.screenForm.account,
-        nickName: this.screenForm.nickName,
-        linkPhone: this.screenForm.phone,
-        email: this.screenForm.email,
+        takerId: this.screenForm.manId,
         status: this.screenForm.status,
       };
       getPickupList(params).then((res) => {
@@ -257,14 +314,38 @@ export default {
     },
 
     // 点击打印
-    printData() {
-      // if(!item.printNum) {
-        // this.queryItem = item;
+    toPrint(item) {
+      if(!item.printNum) {
+        this.queryItem = item;
         this.isShowPrint = true;
-        // addPrint({ids: item.id}).then(res => {
+      }else {
+        this.queryItem = item;
+        this.dialogForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
+        this.dialogForm.createDate = this.getDate();
+        this.isShowDialog = true;
+      }
+    },
 
-        // })
-      // }
+    // 关闭弹窗
+    cancelDialogForm(){
+      this.isShowDialog = false;
+      this.$refs.dialogForm.resetFields();
+    },
+
+    // 提交 弹窗
+    submitDialogForm() {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          let params = {
+            shipId: this.queryItem.invoiceId,
+            password: this.dialogForm.password
+          }
+          checkPassword(params).then(res => {
+            this.cancelDialogForm();
+            this.isShowPrint = true;
+          })
+        }
+      })
     },
   }
 }

src/views/supply/pickup/components/pickup_print.vue

@@ -5,7 +5,7 @@
         <el-row :gutter="0">
           <el-col :span="6" class="item">
             <div class="label">经销商编码：</div>
-            <div class="value">{{detailData.id}}</div>
+            <div class="value">{{detailData.customerId}}</div>
           </el-col>
           <el-col :span="6" class="item">
             <div class="label">出库日期：</div>
@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="6" class="item">
             <div class="label">仓库：</div>
-            <div class="value">{{detailData.retreatTime}}</div>
+            <div class="value">{{detailData.correspondName}}</div>
           </el-col>
           <el-col :span="6" class="item">
             <div class="label">信息密钥：</div>
@@ -54,7 +54,7 @@
     </div>
     
     <div class="page-footer">
-      <div class="footer" :class="classObj">
+      <div class="footer">
         <el-button  type="primary" icon="el-icon-printer" v-print="printObj">打 印</el-button>
         <el-button @click="goBack">关 闭</el-button>
       </div>
@@ -65,7 +65,7 @@
 
 <script>
 import print from 'vue-print-nb'
-import { getDetail } from "@/api/supply/return";
+import { getDetail, addPrint } from "@/api/supply/pickup";
 
 export default {
   name: 'ReturnDetail',
@@ -77,24 +77,15 @@ export default {
   data() {
     return {
       printObj: {
-        id: 'printMe'
+        id: 'printMe',
+        closeCallback: () => {
+          this.addPrint();
+        }
       },
       detailData: {},
     }
   },
 
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
-    },
-  },
-
   created() {
     this.getDetail();
   },
@@ -111,6 +102,14 @@ export default {
         this.detailData = res.data;
       })
     },
+
+    // 添加次数
+    addPrint() {
+      addPrint({ids: this.listItem.invoiceOrderId}).then(res => {
+        // this.$successMsg('提交成功');
+        this.$parent.getList();
+      })
+    }
   }
 }
 </script>
@@ -123,22 +122,21 @@ export default {
   .print-table-1 {
     .item {
       display: flex;
+      padding-right: 10px;
       .label {
-        width: 120px;
         height: 40px;
         display: flex;
         align-items: center;
-        padding: 0 10px;
         box-sizing: border-box;
         font-size: 14px;
         color: #333333;
+        flex-shrink: 0;
       }
       .value {
         flex: 1;
         height: 40px;
         display: flex;
         align-items: center;
-        padding: 0 10px;
         box-sizing: border-box;
         font-size: 14px;
         color: #333333;

src/views/supply/pickup/pickup_list.vue

@@ -90,7 +90,7 @@
             <el-table-column align="center" label="产品编号" prop="materialCode" 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="specification" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="提货总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="提货总数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="100" fixed="right">
               <template slot-scope="scope">

src/views/supply/pickup/sum_list.vue

@@ -58,7 +58,7 @@
           </el-table-column>
           <el-table-column align="center" label="打单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="信息密钥" prop="informationKey" min-width="180" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="发货申请单号" prop="invoiceOrderId" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="发货申请单号" prop="invoiceId" min-width="180" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="预约日期" prop="pickTime" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.pickTime | dateToDayFilter }}