Merge tag 'Hotfix-mo-101' into develop

Finish Hotfix-mo-101

src/components/Common/copy-button.vue

@@ -0,0 +1,48 @@
+<template>
+  <i 
+    class="el-icon-copy-document tag-read"
+    v-if="copyText" 
+    @click="copy(copyText)" 
+    :data-clipboard-text="copyText">
+  </i>
+</template>
+
+<script>
+import Clipboard from 'clipboard'
+
+export default {
+  name: 'CopyButton',
+  props: {
+    copyText: { // 复制文本
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      
+    }
+  },
+  methods: {
+    copy() {
+      const clipboard = new Clipboard('.tag-read');
+      // clipboard.on('success', e => {
+      //   this.$successMsg('复制成功');
+      // })
+      clipboard.on('error', e =>{
+        console.log('该浏览器不支持复制');
+        return false;
+      })
+      this.$successMsg('复制成功');
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .tag-read {
+    color: #409EFF;
+    cursor: pointer;
+    margin-right: 4px;
+  }
+</style>

src/components/Common/print-foshan.vue

@@ -5,7 +5,7 @@
         <div class="title1">{{company}}</div>
         <div class="title2">
           <div></div>
-          <div>销售发货单</div>
+          <div>{{ item.type === 2 ? '销售退货单':'销售发货单' }}</div>
           <div>{{ item.pickOrderWater }}</div>
         </div>
       </div>

src/components/Common/print-guangzhou.vue

@@ -5,7 +5,7 @@
         <div class="title1">{{company}}</div>
         <div class="title2">
           <div></div>
-          <div>销售发货单</div>
+          <div>{{ item.type === 2 ? '销售退货单':'销售发货单' }}</div>
           <div>{{ item.pickOrderWater }}</div>
         </div>
       </div>

src/components/Common/print-shaoguan.vue

@@ -5,7 +5,7 @@
         <div class="title1">{{company}}</div>
         <div class="title2">
           <div></div>
-          <div>销售发货单</div>
+          <div>{{ item.type === 2 ? '销售退货单':'销售发货单' }}</div>
           <div>{{ item.pickOrderWater }}</div>
         </div>
       </div>

src/main.js

@@ -35,6 +35,8 @@ import ExportButton from '@/components/Common/export-button.vue'
 Vue.component('ExportButton', ExportButton);
 import ImportButton from '@/components/Common/import-button.vue'
 Vue.component('ImportButton', ImportButton);
+import CopyButton from '@/components/Common/copy-button.vue'
+Vue.component('CopyButton', CopyButton);
 
 Vue.prototype.$imageUrl = process.env.VUE_APP_BASE_API + 'img/get?key=';
 

src/views/setting/menu.vue

@@ -766,7 +766,7 @@ export default {
     background: #f5f5f5;
   }
 
-  th {
-    text-align: center !important;
-  }
+  // th {
+  //   text-align: center !important;
+  // }
 </style>

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

@@ -108,7 +108,7 @@
       </div>
     </div>
 
-    <el-dialog title="添加产品" :visible.sync="isShowDialog" width="80%">
+    <el-dialog title="添加引用" :visible.sync="isShowDialog" width="80%">
       <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="70px">
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">

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

@@ -106,8 +106,8 @@
       </div>
     </div>
 
-    <el-dialog title="添加产品" :visible.sync="isShowDialog" width="80%">
-      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="70px">
+    <el-dialog title="添加引用" :visible.sync="isShowDialog" width="80%">
+      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="100px">
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="warehouse" label="选择仓库">
@@ -131,8 +131,8 @@
             </el-form-item>
           </el-col> -->
           <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item prop="orderNum" label="订单号">
-              <el-input v-model="screenForm.orderNum" placeholder="请输入订单号"></el-input>
+            <el-form-item prop="orderNum" label="销售出库单号">
+              <el-input v-model="screenForm.orderNum" placeholder="请输入销售出库单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">

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

@@ -168,7 +168,7 @@
       </div>
     </div>
 
-    <el-dialog title="添加产品" :visible.sync="isShowDialog" width="80%">
+    <el-dialog title="添加引用" :visible.sync="isShowDialog" width="80%">
       <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="100px">
         <el-row :gutter="20">
           <el-col :xs="12" :sm="12" :lg="6">

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

@@ -150,6 +150,7 @@
             <el-input v-model="scope.row.remark" size="small"></el-input>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="deleteItem(scope.$index)">删除</el-button>
@@ -168,7 +169,7 @@
       </div>
     </div>
 
-    <el-dialog title="添加产品" :visible.sync="isShowDialog" width="80%">
+    <el-dialog title="添加引用" :visible.sync="isShowDialog" width="80%">
       <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="100px">
         <el-row :gutter="20">
           <el-col :xs="12" :sm="12" :lg="6">
@@ -187,16 +188,8 @@
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item label="发货申请日期" prop="date">
-              <el-date-picker
-                v-model="screenForm.date"
-                type="datetimerange"
-                range-separator="至"
-                style="width: 100%; height: 33px"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-              </el-date-picker>
+            <el-form-item prop="orderNum" label="销售出库单号">
+              <el-input v-model="screenForm.orderNum" placeholder="请输入销售出库单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
@@ -230,6 +223,7 @@
               {{scope.row.orderType | orderTypeFilter}}
             </template>
           </el-table-column>
+          <el-table-column align="center" label="销售出库单号" prop="id" min-width="200" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="工程登录编号" prop="refEnginRecordNo" min-width="200" 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="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
@@ -246,6 +240,7 @@
               <el-input v-model="scope.row.invoiceNum" size="small" type="number"></el-input>
             </template>
           </el-table-column>
+          <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
           <!-- <el-table-column align="center" label="总库存数量" prop="stockAdequate" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{stockFilter(scope.row, 1)}}
@@ -345,7 +340,7 @@ export default {
         loginNum: '',
         enginName: '',
         model: '',
-        date: '',
+        orderNum: '',
         warehouse: '',
         type: '',
       },
@@ -501,10 +496,9 @@ export default {
         refEnginRecordNo: this.screenForm.loginNum,
         refProjectName: this.screenForm.enginName,
         specification: this.screenForm.model,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         correspondId: this.screenForm.warehouse,
         categoryName: this.screenForm.type,
+        id: this.screenForm.orderNum,
         saleType: 2, // 1零售，2工程
       }).then(res => {
         let oldGoodsList = this.goodsList;

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

@@ -759,6 +759,7 @@ export default {
         this.mainForm.loginNum = data.recordNo;
         this.mainForm.enginName = data.projectName;
         this.mainForm.loginType = data.tradeCategory;
+        this.mainForm.factoryNum = data.factoryNo;
         this.mainForm.promiseStatus = data.promiseStatus;
         this.mainForm.company = data.useUnit;
         this.mainForm.contactMan = data.buyUnitCallMen;

src/views/supply/pickup/check.vue

@@ -75,6 +75,7 @@
               </template>
             </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="customerName" min-width="160" 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 }}
@@ -99,10 +100,10 @@
             <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单位" prop="unit" 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="price" min-width="100" show-overflow-tooltip></el-table-column>
+            <!-- <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="使用返利金额" prop="payRebateAmount" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip></el-table-column> -->
             <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="提货方式" prop="pickType" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/supply/retail/components/retail_form.vue

@@ -90,7 +90,7 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
             <div v-else>{{scope.row.price}}</div>
           </template>
         </el-table-column>

src/views/supply/retail/retail_list.vue

@@ -107,37 +107,62 @@
             stripe
             show-summary
             :summary-method="$getSummaries">
-            <!-- <el-table-column align="center" label="提货进度" min-width="120" show-overflow-tooltip>
+            <!-- <el-table-column align="left" label="提货进度" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-progress :text-inside="true" :stroke-width="26" :percentage="((scope.row.hasSendQty * 100) / (scope.row.totalQty * 100)) || 0"></el-progress>
               </template>
             </el-table-column> -->
-            <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+            <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="开票状态" prop="isInvoicing" min-width="100" show-overflow-tooltip>
+            <el-table-column align="left" label="开票状态" prop="isInvoicing" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.isInvoicing ? '已开票':'未开票'}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="订单号" prop="id" min-width="140" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="订单日期" prop="theTime" min-width="120" show-overflow-tooltip>
+            <el-table-column align="left" label="订单号" prop="id" min-width="150" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.id" />
+                <span>{{scope.row.id}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="订单日期" prop="theTime" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div>
+                  <el-button type="text" icon="el-icon-edit" style="padding: 0; margin-right: 4px" v-if="$checkBtnRole('date', $route.meta.roles)" @click="editDate(scope.row)" ></el-button>
                   <span>{{scope.row.theTime | dateToDayFilter}}</span>
-                  <el-button type="text" icon="el-icon-edit" style="padding: 0; margin-left: 6px" v-if="$checkBtnRole('date', $route.meta.roles)" @click="editDate(scope.row)" ></el-button>
                 </div>
               </template>
             </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="materialCode" min-width="120" 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="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="规格型号" prop="specification" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialCode" />
+                <span>{{scope.row.materialCode}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <span>{{scope.row.materialOldNumber}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.isDirectTransfer ? '是':'否'}}
               </template>
@@ -161,7 +186,7 @@
                 {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="返利金额" prop="rebateAmount" min-width="110" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 <div>{{scope.row.rebateAmount | numToFixed}}</div>
@@ -177,11 +202,11 @@
                 {{ scope.row.totalDiscAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="业务员" prop="k3ServiceName" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="制表人" prop="createName" 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="examineName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="业务员" prop="k3ServiceName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核人" prop="examineName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm