Merge branch 'feature/Feature-supply' into develop

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/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/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 + ')' : '未打单' }}
@@ -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;