Finish Hotfix-zh-67

src/layout/components/Navbar.vue

@@ -191,14 +191,15 @@ export default {
     const that = this;
     // 开定时器轮询未读消息接口(写在全局vuex里比较好)
     // that.initNotice();
-    // that.tcMessage();
+    that.tcMessage();
     this.intivalId = setInterval(function () {
       that.tcMessage();
     }, 5000);
     // this.timer = setInterval(function () {
     //   that.initNotice();
     // }, 3000);
-    this.initWebSocket();
+    // 长链接
+    // this.initWebSocket();
   },
   created() {
     this.userInfo = JSON.parse(localStorage.getItem("supply_user"));
@@ -246,22 +247,23 @@ export default {
       });
     },
     async tcMessage() {
-      let data = {
-        type: 'RebateOrderMsg',
-        params: {
-        }
-      }
-      this.websocketSend(JSON.stringify(data))
-      // let res = await getRebateOrderMsg();
-      // if (res.data.hasMessage) {
-      //   this.$notify.info({
-      //     title: "消息",
-      //     message: res.data.messages,
-      //     position: "bottom-right",
-      //     duration: 4000,
-      //     showClose: false,
-      //   });
+      // 长链接
+      // let data = {
+      //   type: 'RebateOrderMsg',
+      //   params: {
+      //   }
       // }
+      // this.websocketSend(JSON.stringify(data))
+      let res = await getRebateOrderMsg();
+      if (res.data.hasMessage) {
+        this.$notify.info({
+          title: "消息",
+          message: res.data.messages,
+          position: "bottom-right",
+          duration: 4000,
+          showClose: false,
+        });
+      }
     },
     goNotice() {
       this.$router.push("/notice/index");

src/views/basic_data/material/category_list.vue

@@ -36,37 +36,41 @@
             stripe
           >
             <el-table-column
-              align="center"
+              align="left"
               label="编码"
               prop="number"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="创建组织"
               prop="dictType"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="名称"
               prop="name"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="使用组织"
               prop="useOrgId"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="数据状态"
               prop="dataState"
               min-width="100"
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="禁用状态"
               prop="disableState"
               min-width="100"
@@ -82,49 +86,53 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="创建人"
               prop="createBy"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="创建日期"
               prop="createTime"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="修改人"
               prop="updateBy"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="修改日期"
               prop="updateTime"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <!-- <el-table-column
-              align="center"
+              align="left"
               label="审核人"
               prop="examine"
               min-width="100"
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="审核日期"
               prop="examineDate"
               min-width="100"
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="禁用人"
               prop="disable"
               min-width="100"
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="禁用日期"
               prop="disableDate"
               min-width="100"
@@ -151,9 +159,10 @@
 </template>
 
 <script>
-import CategoryListDetail from "./components/category_list-detail.vue";
-import { getCategoryList } from "@/api/basic_data/material";
-import Mixin from "@/mixin/index";
+import CategoryListDetail from './components/category_list-detail.vue'
+import { getCategoryList } from '@/api/basic_data/material'
+import Mixin from '@/mixin/index'
+
 export default {
   mixins: [Mixin],
   data() {

src/views/basic_data/material/machine_list.vue

@@ -122,9 +122,9 @@
           @select="hanleSelectAll"
           stripe
         >
-          <el-table-column type="selection" align="center"></el-table-column>
+          <el-table-column type="selection" align="left"></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="类型"
             prop="type"
             min-width="160"
@@ -135,28 +135,28 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="名称"
             prop="name"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="型号"
             prop="model"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="编码"
             prop="number"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="体积"
             prop="volume"
             min-width="160"
@@ -164,28 +164,28 @@
           ></el-table-column>
 
           <el-table-column
-            align="center"
+            align="left"
             label="创建人"
             prop="createBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="创建时间"
             prop="createTime"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="更新人"
             prop="updateBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="更新时间"
             prop="updateTime"
             min-width="160"
@@ -194,6 +194,7 @@
 
           <el-table-column
             align="center"
+            fixed="right"
             label="操作"
             min-width="160"
             show-overflow-tooltip
@@ -295,16 +296,11 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import { downloadFiles, handleImport } from "@/utils/util";
-import {
-  getMachineLlist,
-  getMachineAdd,
-  getMachineDel,
-  getMachineEdit,
-  getDistList,
-} from "@/api/basic_data/material";
-import print from "vue-print-nb";
+import Mixin from '@/mixin/index'
+import { downloadFiles, handleImport } from '@/utils/util'
+import { getDistList, getMachineAdd, getMachineDel, getMachineEdit, getMachineLlist } from '@/api/basic_data/material'
+import print from 'vue-print-nb'
+
 export default {
   mixins: [Mixin],
   directives: {

src/views/basic_data/material/material_list.vue

@@ -62,38 +62,55 @@
           >
             <!-- <el-table-column
               type="selection"
-              align="center"
+              align="left"
               min-width="100"
             ></el-table-column> -->
             <el-table-column
-              align="center"
+              align="left"
               label="使用组织"
               prop="useOrgName"
               min-width="100"
             />
             <el-table-column
-              align="center"
-              label="编码"
+              align="left"
+              label="物料编码"
               prop="number"
-              min-width="100"
+              min-width="200"
               label-class-name="bianma"
               class-name="fontstyle"
-            />
+            >
+              <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.number" />
+              <span>{{scope.row.number}}</span>
+            </template>
+            </el-table-column>
 
             <el-table-column
-              align="center"
-              label="名称"
+              align="left"
+              label="产品名称"
               prop="name"
-              min-width="100"
-            />
+              min-width="200"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.name" />
+                <span>{{scope.row.name}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="规格型号"
               prop="specification"
-              min-width="100"
-            />
+              min-width="200"
+              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="center"
+              align="left"
               label="数据状态"
               prop="forbidStatus"
               min-width="100"
@@ -106,19 +123,20 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="金蝶编码"
               prop="oldNumber"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="是否维护商城资料"
               prop="maintainData"
               min-width="100"
             />
 <!--            <el-table-column-->
-<!--              align="center"-->
+<!--              align="left"-->
 <!--              label="是否维护内外机档案"-->
 <!--              prop="maintainFiles"-->
 <!--              min-width="100"-->
@@ -131,19 +149,20 @@
 <!--              </template>-->
 <!--            </el-table-column>-->
             <el-table-column
-              align="center"
+              align="left"
               label="基本单位"
               prop="baseUnitId"
               min-width="100"
             />
             <el-table-column
-              align="center"
+              align="left"
               label="已使用"
               prop="used"
               min-width="100"
             />
             <el-table-column
               align="center"
+              fixed="right"
               label="操作"
               prop="caozuo"
               min-width="160"

src/views/basic_data/material/modify_list.vue

@@ -159,19 +159,24 @@
           >
             <el-table-column
               type="selection"
-              align="center"
+              align="left"
               width="50"
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="单据号"
               prop="updPriceBillId"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.updPriceBillId" />
+                <span>{{scope.row.updPriceBillId}}</span>
+              </template>
+            </el-table-column>
 
             <el-table-column
-              align="center"
+              align="left"
               label="销售类型"
               prop="saleTypeName"
               :formatter="formatterType"
@@ -179,56 +184,76 @@
               show-overflow-tooltip
             ></el-table-column>
             <!-- <el-table-column
-              align="center"
+              align="left"
               label="产品品类"
               prop="mainName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column> -->
             <el-table-column
-              align="center"
+              align="left"
               label="物料编码"
               prop="materialNumber"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialNumber" />
+                <span>{{scope.row.materialNumber}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="产品名称"
               prop="materialName"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="产品编码"
               prop="materialOldNumber"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <span>{{scope.row.materialOldNumber}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="规格型号"
               prop="specification"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="计量单位"
               prop="unit"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="数量"
               prop="qty"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="批发价"
               prop="batchPrice"
               min-width="160"
@@ -236,35 +261,35 @@
             ></el-table-column>
 
             <el-table-column
-              align="center"
+              align="right"
               label="格力折扣"
               prop="discAmount"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="调价日期"
               prop="createTime"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="生效日期"
               prop="startDate"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="失效日期"
               prop="endDate"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="是否促销价"
               prop="isPromote"
               min-width="160"
@@ -276,7 +301,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="返利类型（钱包）"
               prop="wallets"
               min-width="200"
@@ -301,7 +326,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="现金钱包"
               prop="modifyPriceDepartment"
               min-width="200"
@@ -327,42 +352,42 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="调价部门"
               prop="adminWebsitName"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="调价业务员"
               prop="serviceName"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="制单日期"
               prop="createTime"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="审核人"
               prop="confirmName"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="审核日期"
               prop="confirmTime"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="状态"
               prop="examineStatus"
               min-width="160"

src/views/basic_data/material/price_list.vue

@@ -129,65 +129,87 @@
           fit
           stripe
         >
-<!--          <el-table-column type="selection" align="center" />-->
+<!--          <el-table-column type="selection" align="left" />-->
           <!-- <el-table-column
-            align="center"
+            align="left"
             label="产品品类"
             prop="mainName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column> -->
           <el-table-column
-            align="center"
+            align="left"
             label="物料编码"
             prop="materialNumber"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
-          />
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialNumber" />
+              <span>{{scope.row.materialNumber}}</span>
+            </template>
+          </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="产品编码"
             prop="materialOldNumber"
-            min-width="160"
+            min-width="200"
             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="center"
+            align="left"
             label="产品名称"
             prop="materialName"
-            min-width="160"
+            min-width="200"
             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="center"
+            align="left"
             label="规格型号"
             prop="specification"
-            min-width="160"
+            min-width="200"
             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="center"
+            align="left"
             label="销售类型"
             prop="saleTypeName"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="单位"
             prop="unit"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="数量下限"
             prop="qty"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="返利类型（钱包）"
             prop="wallets"
             min-width="200"
@@ -209,7 +231,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="现金钱包"
             prop="modifyPriceDepartment"
             min-width="200"
@@ -231,7 +253,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="生效日期"
             prop="startDate"
             min-width="160"
@@ -239,14 +261,14 @@
           />
 
           <el-table-column
-            align="center"
+            align="left"
             label="失效日期"
             prop="endDate"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="是否促销价"
             prop="isPromote"
             min-width="160"
@@ -258,7 +280,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="是否促作废"
             prop="isRevoke"
             min-width="160"
@@ -270,28 +292,28 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="批发价1"
             prop="batchPrice"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="格力折扣"
             prop="discAmount"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="备注"
             prop="remark"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            fixed="right"
+            fixed="left"
             width="150"
             label="操作"
             align="center"

src/views/basic_data/material/relation_list.vue

@@ -167,72 +167,82 @@
           @select="hanleSelectAll"
           stripe
         >
-          <el-table-column type="selection" align="center"></el-table-column>
+          <el-table-column type="selection" align="left"></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="产品名称"
             prop="materialName"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialName" />
+              <span>{{scope.row.materialName}}</span>
+            </template>
+          </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="产品型号"
             prop="productModel"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+<!--            <template slot-scope="scope">-->
+<!--              <CopyButton :copyText="scope.row.productModel" />-->
+<!--              <span>{{scope.row.productModel}}</span>-->
+<!--            </template>-->
+          </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="套机编码"
             prop="composeNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="体积"
             prop="productVolume"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="内机编码"
             prop="innerMachineNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="外机编码"
             prop="outsideMachineNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="配件1"
             prop="parts1"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="配件2"
             prop="parts2"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="创建人"
             prop="createBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="创建时间"
             prop="createTime"
             min-width="160"
@@ -240,14 +250,14 @@
           ></el-table-column>
 
           <el-table-column
-            align="center"
+            align="left"
             label="更新人"
             prop="updateBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="更新时间"
             prop="updateTime"
             min-width="160"
@@ -414,20 +424,19 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import { downloadFiles } from "@/utils/util";
+import Mixin from '@/mixin/index'
+import { downloadFiles } from '@/utils/util'
 import {
-  getProductList,
-  getProductEdit,
-  getProductDel,
-  getProductAdd,
+  getDistList,
   getMachineLlist,
   getMaterialList,
-  getDistList,
+  getProductAdd,
+  getProductDel,
   getProductDetail,
-} from "@/api/basic_data/material";
-import { number } from "yargs";
-import { detailed } from "yargs-parser";
+  getProductEdit,
+  getProductList
+} from '@/api/basic_data/material'
+
 export default {
   mixins: [Mixin],
   data() {
@@ -636,7 +645,7 @@ export default {
             type: l.type,
             volume: l.volume,
           });
-          return;
+
         }
       });
     },
@@ -646,7 +655,7 @@ export default {
           this.diaLogForm.productModel = k.specification;
           this.diaLogForm.productNumber = k.number;
           this.diaLogForm.volume = k.volume;
-          return;
+
         }
       });
     },

src/views/basic_data/warehouse/warehouse_book.vue

@@ -27,46 +27,46 @@
           stripe
         >
           <el-table-column
-            align="center"
+            align="left"
             label="序号"
             type="index"
             min-width="60"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="仓库"
             prop="correspondName"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="预约存货类型"
             prop="categoryName"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="最大预约单量(1天)"
             prop="number"
             min-width="160"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input v-model.number="scope.row.number" type="number" :disabled="scope.row.isDisabled" />
+              <el-input class="yinput" v-model.number="scope.row.number" type="number" :disabled="scope.row.isDisabled" />
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="最大预约台数(1天)"
             prop="towerNum"
             min-width="160"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input v-model.number="scope.row.towerNum" type="number" :disabled="scope.row.isDisabled" />
+              <el-input class="yinput" v-model.number="scope.row.towerNum" type="number" :disabled="scope.row.isDisabled" />
             </template>
           </el-table-column>
 
@@ -294,7 +294,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.yinput{
+  ::v-deep input{
+    text-align: right;
+  }
+}
 .btn-group{
   margin: 20px 0;
 }

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -94,67 +94,77 @@
          @select-all="hanleSelectAll"
           @select="hanleSelectAll"
         >
-          <el-table-column type="selection" align="center" min-width="100" />
+          <el-table-column type="selection" align="left" min-width="100" />
 
           <el-table-column
-            align="center"
+            align="left"
             label="经销商编码"
             prop="customerNumber"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
-          />
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.customerNumber" />
+              <span>{{scope.row.customerNumber}}</span>
+            </template>
+          </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="经销商名称"
             prop="customerName"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
-          />
+          > <template slot-scope="scope">
+          <CopyButton :copyText="scope.row.customerName" />
+          <span>{{scope.row.customerName}}</span>
+        </template>
+          </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="存放免费天数"
             prop="freeDay"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="收费规则(每立方米)"
             prop="toll"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="创建人"
             prop="createBy"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="创建时间"
             prop="createTime"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="更新人"
             prop="updateBy"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="更新时间"
             prop="updateTime"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
             label="操作"
+            fixed="right"
             min-width="160"
             show-overflow-tooltip
           >
@@ -267,16 +277,10 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import { downloadFiles, handleImport } from "@/utils/util";
-import {
-  getListToll,
-  getDetail,
-  updateToll,
-  addToll,
-  deleteToll,
-  getCustomerList,
-} from "@/api/basic_data/warehouse";
+import Mixin from '@/mixin/index'
+import { downloadFiles, handleImport } from '@/utils/util'
+import { addToll, deleteToll, getCustomerList, getListToll, updateToll } from '@/api/basic_data/warehouse'
+
 export default {
   mixins: [Mixin],
   data() {

src/views/basic_data/warehouse/warehouse_list.vue

@@ -45,58 +45,66 @@
           >
             <!-- <el-table-column
               type="selection"
-              align="center"
+              align="left"
               min-width="100"
             ></el-table-column> -->
             <el-table-column
-              align="center"
+              align="left"
               label="编码"
               prop="number"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
               label-class-name="bianma"
               class-name="fontstyle"
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="名称"
               prop="name"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="仓库地址"
               prop="address"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="仓库负责人"
               prop="principalName"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="仓库属性"
               prop="stockProperty"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="第三方仓储类型"
               prop="gysStockNumber"
-              min-width="100"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="数据状态"
               prop="documentStatus"
               min-width="100"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="允许即时库存负库存"
               prop="allowMinusQty"
               min-width="100"
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-tag
@@ -108,10 +116,11 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="启用仓位管理"
               prop="openLocation"
               min-width="100"
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-tag type="success" v-if="scope.row.openLocation !== 'false'"
@@ -121,10 +130,11 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="不参与可发量统计"
               prop="notExpQty"
               min-width="100"
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-tag type="success" v-if="scope.row.notExpQty !== 'false'"
@@ -134,10 +144,11 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="参与预警"
               prop="availableAlert"
               min-width="100"
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-tag
@@ -151,6 +162,7 @@
             <el-table-column
               align="center"
               label="操作"
+              fixed="right"
               prop="caozuo"
               min-width="160"
               show-overflow-tooltip
@@ -207,9 +219,10 @@
 </template>
 
 <script>
-import { getList, getStockDetail } from "@/api/basic_data/warehouse";
-import Mixin from "@/mixin/index";
-import WarehouseListDetail from "./components/warehouse_list-detail.vue";
+import { getList, getStockDetail } from '@/api/basic_data/warehouse'
+import Mixin from '@/mixin/index'
+import WarehouseListDetail from './components/warehouse_list-detail.vue'
+
 export default {
   mixins: [Mixin],
   data() {

src/views/basic_data/warehouse/warehouse_site.vue

@@ -79,19 +79,19 @@
           stripe
         >
            <el-table-column
-             align="center"
+             align="left"
       type="selection"
       width="55">
          </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="仓库名称"
             prop="name"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="仓位名称"
             prop="kingDeeStocks"
             min-width="400"
@@ -110,14 +110,14 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="库存警戒线"
             prop="stockCordon"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <!-- <el-table-column
-            align="center"
+            align="left"
             label="库存充足"
             prop="status"
             min-width="160"
@@ -129,37 +129,38 @@
             </template>
           </el-table-column> -->
           <el-table-column
-            align="center"
+            align="left"
             label="创建人"
             prop="createBy"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="创建时间"
             prop="createTime"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="更新人"
             prop="updateBy"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="更新时间"
             prop="updateTime"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
           >
           </el-table-column>
 
           <el-table-column
             align="center"
+            fixed="right"
             label="操作"
             min-width="160"
             show-overflow-tooltip

src/views/engin_deposit/components/deposit_list-detail.vue

@@ -137,84 +137,109 @@
           >
 
             <el-table-column
-              align="center"
+              align="left"
               label="厂工程编码"
               prop="factoryNo"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.factoryNo" />
+                <span>{{scope.row.factoryNo}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="物料编码"
               prop="materialNumber"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialNumber" />
+                <span>{{scope.row.materialNumber}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="产品编码"
               prop="materialOldNumber"
               min-width="160"
               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="center"
+              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="center"
+              align="left"
               label="规格型号"
               prop="specification"
               min-width="160"
               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="center"
+              align="right"
               label="单价"
               prop="price"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="数量"
               prop="qty"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="金额"
               prop="totalAmount"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="发货数量"
               prop="hasSendQty"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="押金金额"
               prop="depositAmount"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="上交资料"
               prop="dataQty"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="收差全额"
               prop="diffAmount"
               min-width="160"
@@ -247,21 +272,21 @@
             stripe
           >
             <el-table-column
-              align="center"
+              align="left"
               label="资料描述"
               prop="dataDescribe"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="原文件名"
               prop="fileName"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="缩略图"
               prop="fileUrl"
               min-width="160"
@@ -308,7 +333,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="下载文件名称"
               prop="fileName"
               min-width="160"
@@ -436,49 +461,64 @@
             stripe
           >
             <el-table-column
-              align="center"
+              align="left"
               label="工程订单号"
               prop="enginOrderNo"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.enginOrderNo" />
+                <span>{{scope.row.enginOrderNo}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="订单日期"
               prop="orderDate"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              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="center"
+              align="left"
               label="规格型号"
               prop="specification"
               min-width="160"
               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="center"
+              align="right"
               label="单价"
               prop="price"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="数量"
               prop="qty"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="押金金额"
               prop="totalDepositAmount"
               min-width="160"
@@ -504,49 +544,64 @@
             stripe
           >
             <el-table-column
-              align="center"
+              align="left"
               label="发货单"
               prop="id"
               min-width="160"
               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="center"
+              align="left"
               label="发货申请日期"
               prop="theTime"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              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="center"
+              align="left"
               label="规格型号"
               prop="specification"
               min-width="160"
               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="center"
+              align="right"
               label="单价"
               prop="price"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="数量"
               prop="refundableQty"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="押金金额"
               prop="totalDepositAmount"
               min-width="160"
@@ -574,49 +629,64 @@
           stripe
         >
           <el-table-column
-            align="center"
+            align="left"
             label="发货单"
             prop="id"
             min-width="160"
             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="center"
+            align="left"
             label="发货申请日期"
             prop="orderTime"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            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="center"
+            align="left"
             label="规格型号"
             prop="specification"
             min-width="160"
             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="center"
+            align="rihgt"
             label="单价"
             prop="price"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="数量"
             prop="refundableQty"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="押金金额"
             prop="totalDepositAmount"
             min-width="160"

src/views/engin_deposit/deposit_list.vue

@@ -118,44 +118,54 @@
             @select-all="handleSelectionAllChange"
             @selection-change="handleSelectionAllChange"
           >
-            <el-table-column align="center" type="selection" width="55" />
+            <el-table-column align="left" type="selection" width="55" />
             <el-table-column
-              align="center"
+              align="left"
               label="工程登录编码"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="使用单位"
               prop="refUseUnit"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="经销商编码"
               prop="customerNumber"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerNumber" />
+                <span>{{scope.row.customerNumber}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="经销商名称"
               prop="customerName"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{scope.row.customerName}}</span>
+              </template>
+            </el-table-column>
             <!-- <el-table-column
-              align="center"
+              align="left"
               label="是否免扣"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column> -->
             <el-table-column
-              align="center"
+              align="left"
               label="是否退押"
               prop="isRefundDeposit"
               min-width="160"
@@ -171,14 +181,14 @@
               </template>
             </el-table-column>
             <!-- <el-table-column
-              align="center"
+              align="left"
               label="押金比例"
               prop=""
               min-width="160"
               show-overflow-tooltip
             ></el-table-column> -->
             <el-table-column
-              align="center"
+              align="right"
               label="押金金额"
               prop="depositAmount"
               min-width="160"
@@ -190,7 +200,7 @@
             </el-table-column>
 
             <el-table-column
-              align="center"
+              align="left"
               label="状态"
               prop="examineStatus"
               min-width="160"
@@ -227,14 +237,14 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="订单数量"
               prop="qty"
               min-width="160"
               show-overflow-tooltip
             />
             <!-- <el-table-column
-              align="center"
+              align="left"
               label="是否已发货"
               prop=""
               min-width="160"

src/views/sales_policy/codealer_list.vue

@@ -60,7 +60,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态" width="120" align="center">
+        <el-table-column prop="status" label="状态" width="120" align="left">
           <template slot-scope="scope">
             <el-tag type="success" size="small" v-if="scope.row.status == 1"
               >已生效</el-tag
@@ -69,40 +69,52 @@
           </template>
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
+          min-width="200"
           prop="code"
           label="销售政策编号"
-          width="150"
-          align="center"
+
+          align="left"
         >
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
+          min-width="150"
           prop="title"
           label="销售政策说明"
-          width="200"
-          align="center"
+
+          align="left"
         >
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
+          min-width="150"
           prop="title"
           label="表头备注"
-          width="200"
-          align="center"
+
+          align="left"
         >
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
+          min-width="150"
           prop="customerCount"
           label="关联经销商"
           width="150"
-          align="center"
+          align="left"
         >
         </el-table-column>
-        <el-table-column prop="startTime" label="生效日期" align="center">
+        <el-table-column   show-overflow-tooltip
+                           min-width="200" prop="startTime" label="生效日期" align="left">
         </el-table-column>
-        <el-table-column prop="endTime" label="结束日期" align="center">
+        <el-table-column   show-overflow-tooltip
+                           min-width="200" prop="endTime" label="结束日期" align="left">
         </el-table-column>
-        <el-table-column prop="createBy" label="制表人" align="center">
+        <el-table-column   show-overflow-tooltip
+                           min-width="200" prop="createBy" label="制表人" align="left">
         </el-table-column>
-        <el-table-column prop="createTime" label="制表日期" align="center">
+        <el-table-column   show-overflow-tooltip
+                           min-width="200" prop="createTime" label="制表日期" align="left">
         </el-table-column>
       </el-table>
     </el-main>

src/views/sales_policy/components/AddCondition.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container >
+  <el-container class="app-container">
     <el-header height="50px" class="header">
       <el-page-header @back="handleBack" :content="!id ? '新增' : '详情页面'">
       </el-page-header>
@@ -46,20 +46,30 @@
                   @select="hanleSelectAll($event, index)"
                   @select-all="hanleSelectAll($event, index)"
                 >
-                  <el-table-column type="selection" width="55" align="center">
+                  <el-table-column type="selection" width="55" align="left">
                   </el-table-column>
                   <el-table-column
-                    label="货品名称"
+                    label="产品名称"
                     width="300"
-                    align="center"
+                    show-overflow-tooltip
+                    align="left"
                     prop="materialName"
                   >
+                    <template slot-scope="scope">
+                      <CopyButton :copyText="scope.row.materialName" />
+                      <span>{{scope.row.materialName}}</span>
+                    </template>
                   </el-table-column>
                   <el-table-column
                     prop="specification"
+                    show-overflow-tooltip
                     label="规格型号"
-                    align="center"
+                    align="left"
                   >
+                    <template slot-scope="scope">
+                      <CopyButton :copyText="scope.row.specification" />
+                      <span>{{scope.row.specification}}</span>
+                    </template>
                   </el-table-column>
                 </el-table>
               </el-row>
@@ -114,7 +124,7 @@
                   <el-table-column
                     type="selection"
                     width="55"
-                    align="center"
+                    align="left"
                     v-if="!id"
                   >
                   </el-table-column>
@@ -122,25 +132,32 @@
                     type="index"
                     label="序号"
                     width="55"
-                    align="center"
+                    align="left"
                     v-else
                   >
                   </el-table-column>
                   <el-table-column
-                    label="货品名称"
+                    label="产品名称"
                     width="300"
-                    align="center"
+                    align="left"
                     prop="materialName"
                   >
-                    <template slot-scope="scope">{{
-                      scope.row.materialName
-                    }}</template>
+                    <template slot-scope="scope">
+                      <CopyButton :copyText="scope.row.materialName" />
+                      <span>{{scope.row.materialName}}</span>
+                    </template>
+
                   </el-table-column>
                   <el-table-column
                     prop="specification"
                     label="规格型号"
-                    align="center"
+                    show-overflow-tooltip
+                    align="left"
                   >
+                    <template slot-scope="scope">
+                      <CopyButton :copyText="scope.row.specification" />
+                      <span>{{scope.row.specification}}</span>
+                    </template>
                   </el-table-column>
                 </el-table>
               </el-row>
@@ -203,12 +220,12 @@
         </el-col>
       </el-row>
     </el-footer>
-    <el-dialog :visible.sync="VisibleModle" width="70%" center>
+    <el-dialog :visible.sync="VisibleModle" width="80%" center>
       <div>
         <el-container>
           <el-header height="">
             <el-form label-width="0" :inline="false" size="small">
-              <el-col :xs="24" :sm="8" :lg="8" :offset="0">
+              <el-col :xs="24" :sm="10" :lg="10" :offset="0">
                 <el-form-item label="">
                   <el-input
                     v-model="saleTypeCode"
@@ -216,7 +233,7 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="8" :lg="8" :offset="0">
+              <el-col :xs="24" :sm="10" :lg="10" :offset="1">
                 <el-form-item label="">
                   <el-button
                     type="primary"
@@ -248,32 +265,51 @@
                           type="selection"
                           width="55"
                           :selectable="selectable"
-                          align="center"
+                          align="left"
                         >
                         </el-table-column>
                         <el-table-column
                           label="产品编码"
                           prop="materialNumber"
-                          width="120"
-                          align="center"
+                          min-width="160"
+                          show-overflow-tooltip
+                          align="left"
                         >
+                          <template slot-scope="scope">
+                            <CopyButton :copyText="scope.row.materialNumber" />
+                            <span>{{scope.row.materialNumber}}</span>
+                          </template>
                         </el-table-column>
                         <el-table-column
                           prop="materialName"
                           label="产品名称"
-                          align="center"
+                          min-width="160"
+                          show-overflow-tooltip
+                          align="left"
                         >
+                          <template slot-scope="scope">
+                            <CopyButton :copyText="scope.row.materialName" />
+                            <span>{{scope.row.materialName}}</span>
+                          </template>
                         </el-table-column>
                         <el-table-column
                           prop="specification"
                           label="产品型号"
-                          align="center"
+                          min-width="160"
+                          show-overflow-tooltip
+                          align="left"
                         >
+                          <template slot-scope="scope">
+                            <CopyButton :copyText="scope.row.specification" />
+                            <span>{{scope.row.specification}}</span>
+                          </template>
                         </el-table-column>
                         <el-table-column
                           prop="price"
                           label="产品价格"
-                          align="center"
+                          min-width="160"
+                          show-overflow-tooltip
+                          align="right"
                         >
                         </el-table-column>
                       </el-table>
@@ -350,32 +386,51 @@
                         <el-table-column
                           type="selection"
                           width="55"
-                          align="center"
+                          align="left"
                         >
                         </el-table-column>
                         <el-table-column
                           label="产品编码"
                           prop="materialNumber"
-                          width="120"
-                          align="center"
+                          min-width="160"
+                          show-overflow-tooltip
+                          align="left"
                         >
+                          <template slot-scope="scope">
+                            <CopyButton :copyText="scope.row.materialNumber" />
+                            <span>{{scope.row.materialNumber}}</span>
+                          </template>
                         </el-table-column>
                         <el-table-column
                           prop="materialName"
                           label="产品名称"
-                          align="center"
+                          min-width="160"
+                          show-overflow-tooltip
+                          align="left"
                         >
+                          <template slot-scope="scope">
+                            <CopyButton :copyText="scope.row.materialName" />
+                            <span>{{scope.row.materialName}}</span>
+                          </template>
                         </el-table-column>
                         <el-table-column
                           prop="specification"
                           label="产品型号"
-                          align="center"
+                          min-width="160"
+                          show-overflow-tooltip
+                          align="left"
                         >
+                          <template slot-scope="scope">
+                            <CopyButton :copyText="scope.row.specification" />
+                            <span>{{scope.row.specification}}</span>
+                          </template>
                         </el-table-column>
                         <el-table-column
                           prop="price"
                           label="产品价格"
-                          align="center"
+                          min-width="160"
+                          show-overflow-tooltip
+                          align="right"
                         >
                         </el-table-column>
                       </el-table>
@@ -473,7 +528,6 @@ export default {
   computed: mapState({
     comCode: (state) => state.sales.code ,
   }),
-  updated() {},
   methods: {
     getList() {},
     handleBack() {

src/views/sales_policy/components/AddPolicy.vue

@@ -7,7 +7,7 @@
           @back="($parent.isShow = 1), ($parent.isFlag = '')"
         />
       </el-header>
-      <div >
+      <div>
         <div class="screen-container">
           <h4>销售政策信息</h4>
           <el-divider />
@@ -77,7 +77,8 @@
                     placeholder="生效日期"
                     default-time="00:00:00"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                  /> </el-form-item></el-col>
+                  /> </el-form-item
+              ></el-col>
               <el-col :xs="24" :ms="12" :lg="12">
                 <el-form-item label="失效日期" prop="endTime">
                   <el-date-picker
@@ -86,7 +87,8 @@
                     placeholder="失效日期"
                     default-time="00:00:00"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                  /> </el-form-item></el-col>
+                  /> </el-form-item
+              ></el-col>
               <el-col :xs="24" :ms="24" :lg="24">
                 <el-form-item label="销售政策说明" prop="remark">
                   <el-input
@@ -119,10 +121,9 @@
                     :file-list="importFileList"
                     :show-file-list="false"
                   >
-                    <el-button
-                      type="primary"
-                      size="small"
-                    >导入货品价格表</el-button>
+                    <el-button type="primary" size="small"
+                      >导入货品价格表</el-button
+                    >
                   </el-upload>
                 </template>
 
@@ -130,7 +131,13 @@
                   type="primary"
                   size="small"
                   @click="hanleDownloadFiles"
-                >下载模板</el-button>
+                  >下载模板</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="small"
+                >导出</el-button
+                >
               </el-col>
             </el-row>
             <el-divider />
@@ -149,25 +156,30 @@
               type="index"
               label="序号"
               width="50"
-              align="center"
+              align="left"
             />
             <el-table-column
               prop="materialNumber"
-              label="货品编码"
-              align="center"
+              label="物料编码"
+              align="left"
+
+              min-width="150"
             >
               <template slot-scope="scope">
+
+
                 <el-select
                   v-model="scope.row.materialNumber"
                   v-el-select-loadmore="loadmore"
                   size="small"
-                  :remote-method="(query)=>remoteMethod(query,'number')"
+                  :remote-method="(query) => remoteMethod(query, 'number')"
                   filterable
                   remote
                   @change="handleK3List($event, scope.row)"
                 >
+                  <template #prefix>        <CopyButton :copyText="scope.row.materialNumber" /></template>
                   <el-option
-                    v-for="(item,index) in k3List"
+                    v-for="(item, index) in k3List"
                     :key="index"
                     :label="item.number"
                     :value="item.id"
@@ -176,37 +188,53 @@
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
+              min-width="150"
               prop="materialName"
-              label="货品名称"
-              align="center"
-            />
+              label="产品名称"
+              align="left"
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
+
+              min-width="150"
               prop="specification"
               label="规格型号"
-              align="center"
+              align="left"
             >
               <template slot-scope="scope">
+
                 <el-select
                   v-model="scope.row.specification"
                   size="small"
-                  :remote-method="(query)=>remoteMethod(query,'specification')"
+                  :remote-method="
+                    (query) => remoteMethod(query, 'specification')
+                  "
                   filterable
                   remote
                   @change="handleK3List($event, scope.row)"
                 >
+                  <template #prefix>        <CopyButton :copyText="scope.row.materialNumber" /></template>
                   <el-option
-                    v-for="(item,index) in k3List"
+                    v-for="(item, index) in k3List"
                     :key="index"
                     :label="item.specification"
                     :value="item.id"
                   />
                 </el-select>
+
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
+              min-width="150"
               prop="saleTypeName"
               label="销售类型"
-              align="center"
+              align="left"
             >
               <template slot-scope="scope">
                 <el-select
@@ -225,14 +253,17 @@
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
+              min-width="150"
               prop="saleTypeCode"
               label="销售类型编码"
-              align="center"
+              align="left"
             />
 
-            <el-table-column prop="discAmount" label="格力折扣" align="center">
+            <el-table-column prop="discAmount" label="格力折扣" align="right">
               <template slot-scope="scope">
                 <el-input
+                  class="yinput"
                   v-model.number="scope.row.discAmount"
                   type="number"
                   placeholder="请输入格力折扣"
@@ -240,9 +271,16 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column prop="price" label="单价" align="center">
+            <el-table-column
+              prop="price"
+              label="单价"
+              align="right"
+              show-overflow-tooltip
+              min-width="150"
+            >
               <template slot-scope="scope">
                 <el-input
+                  class="yinput"
                   v-model.number="scope.row.price"
                   type="number"
                   placeholder="请输入单价"
@@ -250,7 +288,12 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column label="返利钱包" align="center">
+            <el-table-column
+              label="返利钱包"
+              align="left"
+              show-overflow-tooltip
+              min-width="150"
+            >
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.rebateWalletIds"
@@ -267,7 +310,12 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="支付钱包" align="center">
+            <el-table-column
+              label="支付钱包"
+              align="left"
+              show-overflow-tooltip
+              min-width="150"
+            >
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.walletIds"
@@ -284,7 +332,13 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="remark" label="备注" align="center">
+            <el-table-column
+              prop="remark"
+              label="备注"
+              align="left"
+              show-overflow-tooltip
+              min-width="150"
+            >
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.remark"
@@ -301,14 +355,14 @@
                   icon="el-icon-info"
                   icon-color="red"
                   title="内容确定删除吗？"
-
                   @onConfirm="hanleDelete(scope.row.id, scope.$index)"
                 >
                   <el-button
                     slot="reference"
                     type="text"
                     class="textColor el-popover-left"
-                  >删除</el-button>
+                    >删除</el-button
+                  >
                 </el-popconfirm>
               </template>
             </el-table-column>
@@ -322,16 +376,12 @@
             "
           >
             <div>
-              <el-button
-                type="primary"
-                size="small"
-                @click="handleNewInfo"
-              >添加</el-button>
-              <el-button
-                type="primary"
-                size="small"
-                @click="handleSave"
-              >保存</el-button>
+              <el-button type="primary" size="small" @click="handleNewInfo"
+                >添加</el-button
+              >
+              <el-button type="primary" size="small" @click="handleSave"
+                >保存</el-button
+              >
             </div>
             <!--            <el-pagination-->
             <!--              :current-page="dcurrentPage"-->
@@ -351,11 +401,10 @@
                 <h4 style="display: inline-block; margin-right: 20px">
                   条件信息
                 </h4>
-                <el-button
-                  type="primary"
-                  size="small"
-                  @click="isCondition = 1"
-                >添加</el-button></el-col>
+                <el-button type="primary" size="small" @click="isCondition = 1"
+                  >添加</el-button
+                ></el-col
+              >
             </el-row>
             <el-divider />
           </el-row>
@@ -372,9 +421,9 @@
               type="index"
               label="序号"
               width="50"
-              align="center"
+              align="left"
             />
-            <el-table-column prop="name" label="限定条件" align="center">
+            <el-table-column prop="name" label="限定条件" align="left">
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.name"
@@ -395,13 +444,18 @@
                 <el-button
                   type="text"
                   size="small"
-                  @click="scope.row.fang = false;conditName=scope.row.name"
-                >编辑</el-button>
+                  @click="
+                    scope.row.fang = false;
+                    conditName = scope.row.name;
+                  "
+                  >编辑</el-button
+                >
                 <el-button
                   type="text"
                   size="small"
                   @click="handleCondition(scope.row.id, scope.$index)"
-                >删除</el-button>
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -416,7 +470,10 @@
             </el-row>
             <el-divider />
           </el-row>
-          <TabelTransfer @handlEditPolicy="handleAddPolicy" @handleReset="handleReset" />
+          <TabelTransfer
+            @handlEditPolicy="handleAddPolicy"
+            @handleReset="handleReset"
+          />
           <!--          <Transfer @handleAddPolicy="handleAddPolicy" @handleReset="handleReset" />-->
         </div>
       </div>
@@ -452,13 +509,13 @@ import ImageUpload from '@/components/Common/image-upload.vue'
 
 export default {
   directives: {
-    'el-select-loadmore': {
+    "el-select-loadmore": {
       bind(el, binding) {
         // 获取element-ui定义好的scroll盒⼦
         const SELECTWRAP_DOM = el.querySelector(
-          '.el-select-dropdown .el-select-dropdown__wrap'
-        )
-        SELECTWRAP_DOM.addEventListener('scroll', function() {
+          ".el-select-dropdown .el-select-dropdown__wrap"
+        );
+        SELECTWRAP_DOM.addEventListener("scroll", function () {
           /**
            * scrollHeight 获取元素内容⾼度(只读)
            * scrollTop 获取或者设置元素的偏移值,常⽤于, 计算滚动条的位置, 当⼀个元素的容器没有产⽣垂直⽅向的滚动条, 那它的scrollTop的值默认为0.
@@ -467,31 +524,31 @@ export default {
            * ele.scrollHeight - ele.scrollTop === ele.clientHeight;
            */
           const condition =
-            this.scrollHeight - this.scrollTop <= this.clientHeight
+            this.scrollHeight - this.scrollTop <= this.clientHeight;
           if (condition) {
-            binding.value()
+            binding.value();
           }
-        })
-      }
-    }
+        });
+      },
+    },
   },
   mixins: [Minxin],
   data() {
     return {
       fang: false,
-      input: '',
-      baseURL: '',
+      input: "",
+      baseURL: "",
       isCondition: 0,
       searchForm: {
-        code: '',
-        endTime: '',
-        imgSrc: '',
-        remark: '',
-        startTime: '',
-        title: '',
-        mainId: '',
-        mainName: '',
-        type: ''
+        code: "",
+        endTime: "",
+        imgSrc: "",
+        remark: "",
+        startTime: "",
+        title: "",
+        mainId: "",
+        mainName: "",
+        type: "",
       },
       dataList: [],
       addList: [],
@@ -502,20 +559,20 @@ export default {
       importFileList: [],
       fileList: [],
       options: {},
-      value: '',
+      value: "",
       typeList: [],
       walletList: [],
       typeOptions: [
         {
-          value: 'PROVISION',
-          label: '配提'
+          value: "PROVISION",
+          label: "配提",
         },
         {
-          value: 'LIMIT',
-          label: '限量'
-        }
+          value: "LIMIT",
+          label: "限量",
+        },
       ],
-      conditName:'',
+      conditName: "",
       conditionList: [],
       dictList: [],
       k3List: [],
@@ -523,23 +580,23 @@ export default {
       sleectBox: { currentPage: 1 },
       dpageSize: 10,
       dcurrentPage: 1,
-      rebateList: []
-    }
+      rebateList: [],
+    };
   },
   computed: {
     ...mapGetters({
-      comCode: 'code'
-    })
+      comCode: "code",
+    }),
   },
 
   mounted() {
-    this.searchForm.code = this.comCode
+    this.searchForm.code = this.comCode;
   },
   updated() {
-    this.searchForm.code = this.comCode
+    this.searchForm.code = this.comCode;
   },
   created() {
-    this.getCommonApi()
+    this.getCommonApi();
     // console.log(this.$store.code);
 
     if (this.$parent.isFlag) {
@@ -547,81 +604,80 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('sales', ['initData']),
+    ...mapMutations("sales", ["initData"]),
     // 下载excel模板
     hanleDownloadFiles() {
-      downloadFiles('/policy/download')
+      downloadFiles("/policy/download");
     },
     handleCondition(id, index) {
       deleteCondition({ id }).then((res) => {
-        this.conditionList.splice(index, 1)
+        this.conditionList.splice(index, 1);
         Object.assign(
           this.$children[9].$data,
           this.$children[9].$options.data()
-        )
-        this.$successMsg('删除成功')
-      })
+        );
+        this.$successMsg("删除成功");
+      });
     },
     loadmore() {
-      this.sleectBox.currentPage++
-      this.getK3List()
+      this.sleectBox.currentPage++;
+      this.getK3List();
     },
     getK3List() {
       getK3List({
         pageNum: this.sleectBox.currentPage,
         pageSize: 10,
-        keyword: ''
-
+        keyword: "",
       }).then((res) => {
-        this.k3List = [...this.k3List, ...res.data.records]
-      })
+        this.k3List = [...this.k3List, ...res.data.records];
+      });
     },
     remoteMethod(query, type) {
-      console.log(query, type)
-      if (query !== '') {
+      console.log(query, type);
+      if (query !== "") {
         getK3List({
           pageNum: 1,
           pageSize: 100,
-          keyword: '',
-          number: type === 'number' ? query : '',
-          oldNumber: '',
-          specification: type === 'specification' ? query : ''
+          keyword: "",
+          number: type === "number" ? query : "",
+          oldNumber: "",
+          specification: type === "specification" ? query : "",
         }).then((res) => {
-          this.k3List = res.data.records
-        })
+          this.k3List = res.data.records;
+        });
       } else {
-        this.sleectBox.currentPage = 1
-        this.getK3List()
+        this.sleectBox.currentPage = 1;
+        this.getK3List();
       }
     },
     getCommonApi() {
-      this.getK3List()
+      this.getK3List();
       // 非返利钱包
-      getNoRebateWalletList({ walletName: '' }).then((res) => {
-        this.NoRebateWalletList = res.data
-        console.log(this.NoRebateWalletList, 'kkkk')
-      })
+      getNoRebateWalletList({ walletName: "" }).then((res) => {
+        this.NoRebateWalletList = res.data;
+        console.log(this.NoRebateWalletList, "kkkk");
+      });
       getWalletRebateList({
         pageNum: 1,
         pageSize: -2,
-        name: '',
-        status: true
-      }).then(res => {
-        this.rebateList = res.data.records
-        console.log(this.rebateList, 'fanlie')
-      })
+        name: "",
+        status: true,
+      }).then((res) => {
+        this.rebateList = res.data.records;
+        console.log(this.rebateList, "fanlie");
+      });
       const params = {
         pageNum: 1,
         pageSize: -1,
-        saleCode: '',
-        saleName: '',
-        status: ''
-      }
+        saleCode: "",
+        saleName: "",
+        status: "",
+      };
       // 获取销售类型列表
       getTypeList(params).then((res) => {
-        this.typeList = res.data.records
-        console.log(this.typeList, 'xioahsou')
-      })
+        this.typeList = res.data.records;
+        console.log(this.typeList, "xioahsou");
+      });
       // this.handletwoList()
       // const params = {
       //   pageNum: 1,
@@ -648,312 +704,319 @@ export default {
     },
     handleSalesType(e, row) {
       const item = this.typeList.filter((k) => {
-        return k.id === e
-      })[0]
-      const linshi = []
-      const rebateList = []
+        return k.id === e;
+      })[0];
+      const linshi = [];
+      const rebateList = [];
       this.rebateList.forEach((k) => {
         k.saleTypes.forEach((j) => {
           if (!linshi.includes(j.saleTypeId) && j.saleTypeId === e) {
-            rebateList.push(k)
-            linshi.push(j.saleTypeId)
+            rebateList.push(k);
+            linshi.push(j.saleTypeId);
           }
-        })
-      })
-      if (rebateList.length){
-        this.$set(row,'rebateWalletIds',[...new Set([...row.rebateWalletIds,rebateList[0].walletRebateId])])
+        });
+      });
+      if (rebateList.length) {
+        this.$set(row, "rebateWalletIds", [
+          ...new Set([...row.rebateWalletIds, rebateList[0].walletRebateId]),
+        ]);
       }
 
-      this.$set(row, 'saleTypeCode', item.saleCode)
-      this.$set(row, 'saleTypeName', item.saleName)
+      this.$set(row, "saleTypeCode", item.saleCode);
+      this.$set(row, "saleTypeName", item.saleName);
       // this.$set(row,'saleTypeId',item.id)
     },
     // 修改条件名称
     handleConditionName(row) {
-      console.log(row.name)
-      if (this.conditName !== row.name){
+      console.log(row.name);
+      if (this.conditName !== row.name) {
         updateCondition({ id: row.id, name: row.name }).then((res) => {
-          this.$successMsg('修改成功')
-        })
+          this.$successMsg("修改成功");
+        });
       }
-      row.fang = true
+      row.fang = true;
     },
     // 提交信息
     handleSubmitCon() {
       const params = {
-        policyId: this.comCode
-      }
+        policyId: this.comCode,
+      };
       // 获取条件政策
       getConditionList(params).then((res) => {
         for (let i = 0; i < res.data.length; i++) {
-          res.data[i].fang = true
+          res.data[i].fang = true;
         }
-        this.conditionList = res.data
-      })
+        this.conditionList = res.data;
+      });
     },
     // 视图部分已注释，废弃的功能 fucn
     handelStop() {
       if (this.searchForm.mainId) {
-        this.fang = true
+        this.fang = true;
       } else {
-        this.$errorMsg('请选择产品品类')
+        this.$errorMsg("请选择产品品类");
       }
     },
     // 导入
     async handleImport(param) {
-      this.importLoading = true
-      const file = param.file
-      console.log(file, 123)
-      const formData = new FormData()
-      formData.append('file', file)
-      formData.append('policyId', this.searchForm.code)
+      this.importLoading = true;
+      const file = param.file;
+      console.log(file, 123);
+      const formData = new FormData();
+      formData.append("file", file);
+      formData.append("policyId", this.searchForm.code);
       // formData.append("mainId", this.searchForm.mainId);
-      const result = await handleImport('/policy/material/import', formData)
-      this.importLoading = false
-      this.importFileList = []
+      const result = await handleImport("/policy/material/import", formData);
+      this.importLoading = false;
+      this.importFileList = [];
       if (result.code === 200) {
-        this.$alert(result.message, '导入成功', {
-          confirmButtonText: '确定'
-        })
-        this.dataList = []
-        this.listTotal = 0
-        this.sleectBox.currentPage = 1
-        this.handletwoList()
+        this.$alert(result.message, "导入成功", {
+          confirmButtonText: "确定",
+        });
+        this.dataList = [];
+        this.listTotal = 0;
+        this.sleectBox.currentPage = 1;
+        this.handletwoList();
       } else {
-        this.$alert(result.message, '导入失败', {
-          confirmButtonText: '确定'
-        })
+        this.$alert(result.message, "导入失败", {
+          confirmButtonText: "确定",
+        });
       }
     },
     getList() {
       if (this.$parent.isFlag) {
-        this.handletwoList()
+        this.handletwoList();
       }
     },
     // 更改每页数量
     handleSizeChange1(val) {
-      this.pageSize = val
-      this.currentPage = 1
-      this.handletwoList()
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.handletwoList();
     },
     // 更改当前页
     handleCurrentChange1(val) {
-      this.currentPage = val
-      this.handletwoList()
+      this.currentPage = val;
+      this.handletwoList();
     },
 
     // 更改每页数量
     handleSizeChange2(val) {
-      this.dpageSize = val
-      this.dcurrentPage = 1
+      this.dpageSize = val;
+      this.dcurrentPage = 1;
 
-      this.handletwoList()
+      this.handletwoList();
     },
     // 更改当前页
     handleCurrentChange2(val) {
-      this.dcurrentPage = val
-      this.handletwoList()
+      this.dcurrentPage = val;
+      this.handletwoList();
     },
     // 获取货品信息
     handletwoList() {
       // this.searchForm.type
-      this.listLoading = true
+      this.listLoading = true;
 
       const paramss = {
         pageNum: this.dcurrentPage,
         pageSize: this.dpageSize,
         policyId: this.comCode,
-        saleTypeCode: ''
-      }
+        saleTypeCode: "",
+      };
 
       getMaterialList(paramss)
         .then((result) => {
           result.data.records.forEach((k) => {
-            k.walletIds = []
-            k.rebateWalletIds = []
+            k.walletIds = [];
+            k.rebateWalletIds = [];
             if (!k.specification) {
-              k.materialNumber = k.materialId
-              k.specification = k.materialId
+              k.materialNumber = k.materialId;
+              k.specification = k.materialId;
             }
 
             k.walletRelaList.forEach((l) => {
-              l.id = l.walletId
-              l.name = l.walletName
-              if (l.type==='REBATE'){
-                k.rebateWalletIds = [...k.rebateWalletIds, l.walletId]
-              }else {
-                k.walletIds = [...k.walletIds, l.walletId]
+              l.id = l.walletId;
+              l.name = l.walletName;
+              if (l.type === "REBATE") {
+                k.rebateWalletIds = [...k.rebateWalletIds, l.walletId];
+              } else {
+                k.walletIds = [...k.walletIds, l.walletId];
               }
               // k.walletIds = [...k.walletIds, l.walletId]
-            })
-          })
+            });
+          });
           // this.dataList=[]
-          this.dataList = result.data.records
-          this.listTotal = result.data.total
-          this.listLoading = false
+          this.dataList = result.data.records;
+          this.listTotal = result.data.total;
+          this.listLoading = false;
         })
         .catch((err) => {
-          console.error(err)
+          console.error(err);
           // this.listLoading = false
-        })
+        });
     },
     // 提交审核
     handleAddPolicy(policyCustomers) {
       if (!this.searchForm.title) {
-        this.$errorMsg('请输入说明')
-        return
+        this.$errorMsg("请输入说明");
+        return;
       }
       if (!this.searchForm.type) {
-        this.$errorMsg('请选择类型')
-        return
+        this.$errorMsg("请选择类型");
+        return;
       }
       if (!this.searchForm.startTime) {
-        this.$errorMsg('请选择生效日期')
-        return
+        this.$errorMsg("请选择生效日期");
+        return;
       }
 
       if (policyCustomers.length) {
-        var arr = []
+        var arr = [];
         policyCustomers.forEach((el) => {
           arr.push({
             customerId: el.id,
             customerName: el.name,
             customerNumber: el.number,
-            lastOrderTime: '',
+            lastOrderTime: "",
             limitTakeNum: 0,
             policyId: this.comCode,
-            policyTitle: '',
-            remark: ''
-          })
-        })
+            policyTitle: "",
+            remark: "",
+          });
+        });
         // this.dictList.forEach((k) => {
         //   if (k.dictCode == this.searchForm.mainId) {
         //     this.searchForm.mainName = k.dictValue;
         //   }
         // });
         const params = {
-          adminCompanyId: '',
-          code: '',
+          adminCompanyId: "",
+          code: "",
           customerCount: 0,
-          examineBy: '',
-          examineRemark: '',
-          examineStatus: '',
-          id: '',
+          examineBy: "",
+          examineRemark: "",
+          examineStatus: "",
+          id: "",
           policyCustomers: arr,
-          remark: '',
+          remark: "",
           status: true,
-          title: '',
-          type: '',
+          title: "",
+          type: "",
           ...this.searchForm,
-          endTime: this.searchForm.endTime || '2100-01-01 00:00:00',
-          imgSrc: this.fileList.length ? this.fileList[0].url : ''
-        }
-        console.log(this.fileList)
+          endTime: this.searchForm.endTime || "2100-01-01 00:00:00",
+          imgSrc: this.fileList.length ? this.fileList[0].url : "",
+        };
+        console.log(this.fileList);
         addPoliy(params).then((res) => {
-          console.log(res)
-          this.$successMsg('新增成功')
-          this.$parent.getList()
-          this.$parent.isShow = 1
-        })
+          console.log(res);
+          this.$successMsg("新增成功");
+          this.$parent.getList();
+          this.$parent.isShow = 1;
+        });
       } else {
-        this.$errorMsg('选择经销商 ')
+        this.$errorMsg("选择经销商 ");
       }
     },
     // 删除
     hanleDelete(id, index) {
       if (id) {
-        const params = { policyMaterialId: id }
+        const params = { policyMaterialId: id };
         deleteMaterialPolicy(params).then((res) => {
-          this.dataList.splice(index, 1)
-        })
-        return
+          this.dataList.splice(index, 1);
+        });
+        return;
       }
-      this.dataList.splice(index, 1)
+      this.dataList.splice(index, 1);
       // this.listTotal -= 1;
-      this.$successMsg('删除成功')
+      this.$successMsg("删除成功");
     },
     handleNewInfo() {
       // 物料列表
 
       this.dataList.push({
-        id: '',
+        id: "",
         discAmount: 0,
-        materialId: '',
-        materialName: '',
-        materialNumber: '',
+        materialId: "",
+        materialName: "",
+        materialNumber: "",
         policyId: this.comCode,
-        price: '',
-        remark: '',
-        saleTypeCode: '',
-        saleTypeId: '',
-        saleTypeName: '',
-        specification: '',
+        price: "",
+        remark: "",
+        saleTypeCode: "",
+        saleTypeId: "",
+        saleTypeName: "",
+        specification: "",
         rebateWalletIds: [],
         walletIds: [this.NoRebateWalletList[0].id],
-        walletRelaList: []
-      })
-      this.sleectBox.currentPage = 1
+        walletRelaList: [],
+      });
+      this.sleectBox.currentPage = 1;
       // this.listTotal += 1;
       // this.dataList.push(this.addList[this.addList.length-1])
     },
     handleSave() {
       if (!this.dataList.length) {
-        return
+        return;
       }
       for (let i = 0; i < this.dataList.length; i++) {
         if (!this.dataList[i].materialId) {
-          this.$errorMsg('请选择货品')
-          return
+          this.$errorMsg("请选择货品");
+          return;
         }
         if (!this.dataList[i].saleTypeId) {
-          this.$errorMsg('请选择销售类型')
-          return
+          this.$errorMsg("请选择销售类型");
+          return;
         }
 
         if (!this.dataList[i].price) {
-          this.$errorMsg('请输入单价')
-          return
+          this.$errorMsg("请输入单价");
+          return;
         }
         if (!this.dataList[i].walletIds.length) {
-          this.$errorMsg('请选择支付钱包')
-          return
+          this.$errorMsg("请选择支付钱包");
+          return;
         }
       }
 
       savePolicy(this.dataList).then((res) => {
-        this.dataList = []
-        this.sleectBox.currentPage = 1
-        this.$successMsg('保存成功')
-        this.handletwoList()
-      })
+        this.dataList = [];
+        this.sleectBox.currentPage = 1;
+        this.$successMsg("保存成功");
+        this.handletwoList();
+      });
     },
     handleK3List(e, row) {
       const item = this.k3List.filter((k) => {
-        return k.id == e
-      })[0]
-      this.$set(row, 'materialNumber', item.number)
-      this.$set(row, 'materialName', item.name)
-      this.$set(row, 'specification', item.specification)
-      this.$set(row, 'materialId', item.id)
-      this.getK3List()
+        return k.id == e;
+      })[0];
+      this.$set(row, "materialNumber", item.number);
+      this.$set(row, "materialName", item.name);
+      this.$set(row, "specification", item.specification);
+      this.$set(row, "materialId", item.id);
+      this.getK3List();
     },
     handleReset() {
-      Object.assign(this.$data, this.$options.data())
-      this.getCommonApi()
-    }
+      Object.assign(this.$data, this.$options.data());
+      this.getCommonApi();
+    },
   },
   components: {
     TabelTransfer,
     AddCondition,
-    ImageUpload
-  }
-}
+    ImageUpload,
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 h4 {
   margin: 0;
 }
+.yinput{
+  ::v-deep input{
+    text-align: right;
+  }
+}
 .pdt {
   padding-top: 20px;
 }

src/views/sales_policy/components/EditCondition.vue

@@ -48,7 +48,7 @@
                   <el-table-column type="selection" width="55" align="center">
                   </el-table-column>
                   <el-table-column
-                    label="货品名称"
+                    label="产品名称"
                     width="300"
                     align="center"
                     prop="materialName"
@@ -124,7 +124,7 @@
                   >
                   </el-table-column>
                   <el-table-column
-                    label="货品名称"
+                    label="产品名称"
                     width="300"
                     align="center"
                     prop="materialName"
@@ -455,6 +455,7 @@ export default {
     };
   },
   created() {
+    console.log(this.id,this.policyId)
     this.getCommonApi();
   },
   computed: mapState({
@@ -483,6 +484,7 @@ export default {
       // 如果没有返回值则默认返回false(全部无法选中)
     },
     async getCommonApi() {
+
       if (this.id) {
         const res = await getConditionMaterialDetail({ id: this.id });
         this.pop = res.data.pop;

src/views/sales_policy/components/Examine.vue

@@ -181,35 +181,61 @@
               type="index"
               label="序号"
               width="50"
-              align="center"
+              align="left"
             />
             <el-table-column
               prop="materialNumber"
-              label="货品编码"
-              align="center"
-            />
+              label="物料编码"
+              min-width="160"
+              show-overflow-tooltip
+              align="left"
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialNumber" />
+                <span>{{scope.row.materialNumber}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="materialName"
-              label="货品名称"
-              align="center"
-            />
+              label="产品名称"
+              min-width="160"
+              show-overflow-tooltip
+              align="left"
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="specification"
               label="规格型号"
-              align="center"
-            />
+              min-width="160"
+              show-overflow-tooltip
+              align="left"
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="saleTypeCode"
-              label="销售类型编码"
-              align="center"
+              label="销售类型编码"    min-width="160"
+              show-overflow-tooltip
+              align="left"
             />
             <el-table-column
               prop="saleTypeName"
               label="销售类型"
-              align="center"
+              min-width="160"
+              show-overflow-tooltip
+              align="left"
             />
-            <el-table-column prop="price" label="单价" align="center" />
-            <el-table-column label="支付钱包" align="center">
+            <el-table-column prop="discAmount" label="格力折扣" align="right" />
+            <el-table-column prop="price" label="单价" align="right" />
+            <el-table-column label="支付钱包" align="left"     min-width="160"
+                             show-overflow-tooltip>
               <template slot-scope="scope">
                 <template  v-for="item in scope.row.walletRelaList">
                   <el-tag
@@ -221,7 +247,8 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="支付钱包" align="center">
+            <el-table-column label="支付钱包" align="left"     min-width="160"
+                             show-overflow-tooltip>
               <template slot-scope="scope">
                 <template  v-for="item in scope.row.walletRelaList">
                   <el-tag
@@ -235,7 +262,7 @@
             </el-table-column>
             <!-- <el-table-column
               label="操作"
-              align="center"
+              align="left"
               width="150"
               v-if="$parent.isShow == 5 && detail.examineStatus == 'SAVE'"
             >
@@ -294,14 +321,14 @@
               type="index"
               label="序号"
               width="50"
-              align="center"
+              align="left"
             />
-            <el-table-column prop="name" label="限定条件" align="center">
+            <el-table-column prop="name" label="限定条件" align="left">
               <template slot-scope="scope">
                 {{ scope.row.name }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="left" width="150">
               <template slot-scope="scope">
                 <template v-if="$parent.isShow == 5">
                   <el-button
@@ -361,18 +388,26 @@
                 type="index"
                 label="序号"
                 width="50"
-                align="center"
+                align="left"
               />
               <el-table-column
                 prop="customerNumber"
                 label="经销商编码"
-                align="center"
-              />
+                align="left"
+              >    <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerNumber" />
+                <span>{{ scope.row.customerNumber }}</span>
+              </template></el-table-column>
               <el-table-column
                 prop="customerName"
                 label="经销商名称"
-                align="center"
-              />
+                align="left"
+              >
+                <template slot-scope="scope">
+                  <CopyButton :copy-text="scope.row.customerName" />
+                  <span>{{ scope.row.customerName }}</span>
+                </template>
+              </el-table-column>
             </el-table>
             <!-- 分页 -->
             <div style="margin: 20px 0">
@@ -411,18 +446,28 @@
                     type="selection"
                     width="55"
                     :selectable="selectable"
-                    align="center"
+                    align="left"
                   />
                   <el-table-column
                     prop="number"
                     label="经销商编码"
-                    align="center"
-                  />
+                    align="left"
+                  >
+                    <template slot-scope="scope">
+                      <CopyButton :copy-text="scope.row.number" />
+                      <span>{{ scope.row.number }}</span>
+                    </template>
+                  </el-table-column>
                   <el-table-column
                     prop="name"
                     label="经销商名称"
-                    align="center"
-                  />
+                    align="left"
+                  >
+                    <template slot-scope="scope">
+                      <CopyButton :copy-text="scope.row.name" />
+                      <span>{{ scope.row.name }}</span>
+                    </template>
+                  </el-table-column>
                 </el-table>
                 <!-- 分页 -->
                 <div style="margin: 20px 0">
@@ -482,17 +527,27 @@
                   @select-all="handleSelectionAllChange2"
                   @selection-change="handleSelectionChange2"
                 >
-                  <el-table-column type="selection" width="55" align="center" />
+                  <el-table-column type="selection" width="55" align="left" />
                   <el-table-column
                     prop="customerNumber"
                     label="经销商编码"
-                    align="center"
-                  />
+                    align="left"
+                  >
+                    <template slot-scope="scope">
+                      <CopyButton :copy-text="scope.row.customerNumber" />
+                      <span>{{ scope.row.customerNumber }}</span>
+                    </template>
+                  </el-table-column>
                   <el-table-column
                     prop="customerName"
                     label="经销商名称"
-                    align="center"
-                  />
+                    align="left"
+                  >
+                    <template slot-scope="scope">
+                      <CopyButton :copy-text="scope.row.customerName" />
+                      <span>{{ scope.row.customerName }}</span>
+                    </template>
+                  </el-table-column>
                 </el-table>
                 <!-- 分页 -->
                 <!-- <div style="margin: 20px 0">

src/views/sales_policy/components/TabelTransfer.vue

@@ -24,6 +24,11 @@
           size="small"
           @click="hanleDownloadFiles"
         >下载模板</el-button>
+        <el-button
+          type="primary"
+          size="small"
+        >导出已选</el-button
+        >
       </el-row>
       <el-row type="flex">
         <el-col>
@@ -60,18 +65,22 @@
             type="selection"
             width="55"
             :selectable="selectable"
-            align="center"
+            align="left"
           />
           <!--          <el-table-column-->
           <!--            prop="number"-->
           <!--            label="经销商编码"-->
-          <!--            align="center"-->
+          <!--            align="left"-->
           <!--          />-->
           <el-table-column
             prop="name"
             label="经销商名称"
-            align="center"
-          />
+            align="left"
+          ><template slot-scope="scope">
+            <CopyButton :copy-text="scope.row.name" />
+            <span>{{ scope.row.name }}</span>
+          </template>
+          </el-table-column>
         </el-table>
         <!-- 分页 -->
         <div style="margin: 20px 0">
@@ -131,17 +140,22 @@
           @select-all="handleSelectionAllChange2"
           @selection-change="handleSelectionChange2"
         >
-          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column type="selection" width="55" align="left" />
           <!--          <el-table-column-->
           <!--            prop="customerNumber"-->
           <!--            label="经销商编码"-->
-          <!--            align="center"-->
+          <!--            align="left"-->
           <!--          />-->
           <el-table-column
             prop="customerName"
             label="经销商名称"
-            align="center"
-          />
+            align="left"
+          >
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.customerName" />
+              <span>{{ scope.row.customerName }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </el-col>
     </el-row>

src/views/sales_policy/components/editPolicy.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <div v-show="isCondition == 0">
+  <div>
+    <div class="app-container" v-show="isCondition == 0">
       <el-header height="50px" class="header">
         <el-page-header
           content="编辑"
@@ -149,14 +149,17 @@
               type="index"
               label="序号"
               width="50"
-              align="center"
+              align="left"
             />
             <el-table-column
+
+              min-width="150"
               prop="materialNumber"
-              label="货品编码"
-              align="center"
+              label="物料编码"
+              align="left"
             >
               <template slot-scope="scope">
+
                 <el-select
                   v-model="scope.row.materialNumber"
                   v-el-select-loadmore="loadmore"
@@ -166,6 +169,7 @@
                   remote
                   @change="handleK3List($event, scope.row)"
                 >
+                  <template #prefix>        <CopyButton :copyText="scope.row.materialNumber" /></template>
                   <el-option
                     v-for="item in k3List"
                     :key="item.id"
@@ -176,16 +180,27 @@
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
+              min-width="150"
               prop="materialName"
-              label="货品名称"
-              align="center"
-            />
+              label="产品名称"
+              align="left"
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
+            </el-table-column>
             <el-table-column
+
+              min-width="150"
               prop="specification"
               label="规格型号"
-              align="center"
+              align="left"
             >
               <template slot-scope="scope">
+
                 <el-select
                   v-model="scope.row.specification"
                   size="small"
@@ -194,6 +209,7 @@
                   remote
                   @change="handleK3List($event, scope.row)"
                 >
+                  <template #prefix>        <CopyButton :copyText="scope.row.materialNumber" /></template>
                   <el-option
                     v-for="item in k3List"
                     :key="item.id"
@@ -204,9 +220,11 @@
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
+              min-width="150"
               prop="saleTypeName"
               label="销售类型"
-              align="center"
+              align="left"
             >
               <template slot-scope="scope">
                 <el-select
@@ -225,14 +243,17 @@
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
+              min-width="150"
               prop="saleTypeCode"
               label="销售类型编码"
-              align="center"
+              align="left"
             />
 
-            <el-table-column prop="discAmount" label="格力折扣" align="center">
+            <el-table-column prop="discAmount" label="格力折扣" align="right">
               <template slot-scope="scope">
                 <el-input
+                  class="yinput"
                   v-model.number="scope.row.discAmount"
                   type="number"
                   placeholder="请输入格力折扣"
@@ -240,9 +261,11 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column prop="price" label="单价" align="center">
+            <el-table-column prop="price" label="单价" align="right"  show-overflow-tooltip
+                             min-width="150">
               <template slot-scope="scope">
                 <el-input
+                  class="yinput"
                   v-model.number="scope.row.price"
                   type="number"
                   placeholder="请输入单价"
@@ -250,7 +273,8 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column label="返利钱包" align="center">
+            <el-table-column label="返利钱包" align="left"  show-overflow-tooltip
+                             min-width="150">
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.rebateWalletIds"
@@ -267,7 +291,8 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="支付钱包" align="center">
+            <el-table-column label="支付钱包" align="left"  show-overflow-tooltip
+                             min-width="150">
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.walletIds"
@@ -291,7 +316,8 @@
                 > -->
               </template>
             </el-table-column>
-            <el-table-column prop="remark" label="备注" align="center">
+            <el-table-column prop="remark" label="备注" align="left"  show-overflow-tooltip
+                             min-width="150">
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.remark"
@@ -379,9 +405,9 @@
               type="index"
               label="序号"
               width="50"
-              align="center"
+              align="left"
             />
-            <el-table-column prop="name" label="限定条件" align="center">
+            <el-table-column prop="name" label="限定条件" align="left">
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.name"
@@ -531,7 +557,9 @@ export default {
       dpageSize: 10,
       dcurrentPage: 1,
       detail: {},
-      rebateList: []
+      rebateList: [],
+      cid:'',
+      cpolicyId:''
     }
   },
   computed: {
@@ -567,6 +595,9 @@ export default {
     },
     addCondition() {
       this.isCondition = 1
+       this.cid = this.conditionList[0].id
+      this.cpolicyId = this.conditionList[0].policyId
+      console.log(this.cid,this.cpolicyId)
       this.$store.commit('sales/setId', this.searchForm.code)
     },
     loadmore() {
@@ -977,6 +1008,11 @@ export default {
 h4 {
   margin: 0;
 }
+.yinput{
+  ::v-deep input{
+    text-align: right;
+  }
+}
 .pdt {
   padding-top: 20px;
 }

src/views/sales_policy/policy_list.vue

@@ -245,13 +245,13 @@
             </el-popconfirm>
           </template>
         </el-table-column>
-        <el-table-column label="状态" width="120" align="center">
+        <el-table-column label="状态" width="120" align="left">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status == '1'">已生效</el-tag>
             <el-tag v-else-if="scope.row.status == '0'">未生效 </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="审核状态" width="120" align="center">
+        <el-table-column label="审核状态" width="120" align="left">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.examineStatus == 'SAVE'">保存</el-tag>
             <el-tag
@@ -265,45 +265,52 @@
         <el-table-column
           prop="code"
           label="销售政策编号"
-          width="120"
-          align="center"
+          show-overflow-tooltip
+          min-width="200"
+          align="left"
         />
         <el-table-column
+          show-overflow-tooltip
           prop="title"
           label="销售政策说明"
-          width="120"
-          align="center"
+         min-width="150"
+          align="left"
         />
         <!-- <el-table-column
           prop="mainName"
           label="产品品类"
-          align="center"
+          align="left"
         ></el-table-column> -->
         <el-table-column
+          show-overflow-tooltip
           prop="remark"
           label="表头备注"
-          width="120"
-          align="center"
+         min-width="150"
+          align="left"
         />
-        <el-table-column prop="startTime" label="生效日期" align="center" />
-        <el-table-column prop="endTime" label="结束日期" align="center" />
+        <el-table-column  min-width="200" show-overflow-tooltip prop="startTime" label="生效日期" align="left" />
+        <el-table-column  min-width="200"  show-overflow-tooltip prop="endTime" label="结束日期" align="left" />
         <el-table-column
+          show-overflow-tooltip
+
           prop="createBy"
           label="制表人"
-          width="120"
-          align="center"
+         min-width="200"
+          align="left"
         />
         <el-table-column
+          show-overflow-tooltip
           prop="createTime"
           label="制表日期"
-          width="120"
-          align="center"
+         min-width="200"
+          align="left"
         />
         <el-table-column
+          show-overflow-tooltip
           prop="examineBy"
           label="审核人"
-          width="120"
-          align="center"
+         min-width="200"
+          align="left"
         />
       </el-table>
       <!-- 分页 -->

src/views/setting/sub_account.vue

@@ -15,11 +15,11 @@
 
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="center" label="序号" type="index" width="50" />
-          <el-table-column align="center" label="账号" prop="userName" />
-          <el-table-column align="center" label="创建时间" prop="createTime" />
-          <el-table-column align="center" label="最后登录时间" prop="lastLoginTime" />
-          <el-table-column align="center" label="主帐号" prop="isMaster">
+          <el-table-column align="left" label="序号" type="index" width="50" />
+          <el-table-column align="left" label="账号" prop="userName" />
+          <el-table-column align="left" label="创建时间" prop="createTime" />
+          <el-table-column align="left" label="最后登录时间" prop="lastLoginTime" />
+          <el-table-column align="left" label="主帐号" prop="isMaster">
             <template slot-scope="scope">
 
               <el-tag v-if="scope.row.isMaster" type="success">是</el-tag>

src/views/supply/displace/components/displace_form.vue

@@ -243,7 +243,7 @@
             </template>
           </el-table-column>
           <el-table-column align="center" prop="saleTypeName" label="销售类型" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" prop="materialName" label="货品名称" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" prop="materialName" label="产品名称" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="specification" label="规格型号" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="unit" label="单位" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="qty" label="数量" show-overflow-tooltip></el-table-column>

src/views/supply/policy/components/policy_list.vue

@@ -159,7 +159,7 @@
             ></el-table-column>
             <el-table-column
               align="center"
-              label="货品名称"
+              label="产品名称"
               prop="materialName"
               min-width="160"
               show-overflow-tooltip

src/views/supply/policy/components/retail_detail.vue

@@ -11,7 +11,7 @@
           :stroke-width="26"
           :percentage="
             detailData.thjd ? +((detailData.thjd * 1000) / 10).toFixed(2) : 0
-        "
+          "
         />
       </div>
 
@@ -84,44 +84,61 @@
           show-summary
           :summary-method="$getSummaries"
         >
-          <el-table-column align="center" label="序号" type="index" width="50" />
+          <el-table-column align="left" label="序号" type="index" width="50" />
           <el-table-column
-            align="center"
+            align="left"
             label="销售类型"
             prop="saleTypeName"
             min-width="100"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="物料编码"
             prop="materialCode"
             min-width="160"
             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="center"
+            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="center"
+            align="left"
             label="规格型号"
             prop="specification"
             min-width="160"
             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="center"
+            align="left"
             label="单位"
             prop="unit"
             min-width="100"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="单价"
             prop="price"
             min-width="100"
@@ -132,14 +149,14 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="数量"
             prop="qty"
             min-width="100"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="订单金额"
             prop="totalAmount"
             min-width="100"
@@ -150,7 +167,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="返利类型"
             prop="customerWalletName2"
             min-width="100"
@@ -168,7 +185,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="返利金额"
             prop="payRebateAmount"
             min-width="100"
@@ -179,7 +196,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="格力折扣"
             prop="totalDiscAmount"
             min-width="100"
@@ -190,7 +207,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="现金钱包"
             prop="customerWalletName"
             min-width="100"
@@ -204,7 +221,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="实付金额"
             prop="payAmount"
             min-width="100"
@@ -215,7 +232,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="是否直调"
             prop="isDirectTransfer"
             min-width="100"
@@ -226,7 +243,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="直调数量"
             prop="directTransferQty"
             min-width="100"
@@ -234,28 +251,28 @@
           />
 
           <!-- <el-table-column
-            align="center"
+            align="left"
             label="已退数量"
             prop="retiredQty"
             min-width="100"
             show-overflow-tooltip
           ></el-table-column> -->
           <el-table-column
-            align="center"
+            align="right"
             label="原订单数量"
             prop="oldQty"
             min-width="100"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="备注"
             prop="remark"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="税率"
             prop="tax"
             min-width="100"
@@ -277,7 +294,7 @@
             <el-col :span="12" class="item">
               <div class="label">审批结果</div>
               <div class="value">
-                {{ detailData.examineStatus | statusFilter }}
+                {{ detailData.examineStatus | statusFilter(detailData.examineTime) }}
               </div>
             </el-col>
             <el-col :span="24" class="item">
@@ -291,12 +308,12 @@
 
     <div class="page-footer">
       <div class="footer" :class="classObj">
-        <el-button type="success" @click="toCheckOrder" >联查单据</el-button>
-        <el-button type="primary" @click="openDirectDialog" v-if="isCustomer" :disabled="detailData.examineStatus !== 'OK'">提前开票</el-button>
+        <el-button type="success" @click="toCheckOrder">联查单据</el-button>
+        <el-button v-if="isCustomer" type="primary" :disabled="detailData.examineStatus !== 'OK'" @click="openDirectDialog">提前开票</el-button>
 
         <el-button
-          :type="status ? 'info' : 'primary'"
           v-if="isCustomer"
+          :type="status ? 'info' : 'primary'"
           :disabled="detailData.examineStatus !== 'OK' || status "
           @click="openDeliverDialog"
         >直调发货</el-button>
@@ -315,28 +332,28 @@
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item label="调出仓库" prop="warehouse1">
               <el-select v-model="directForm.warehouse1" placeholder="请选择调出仓库" style="width: 100%" filterable @change="changeWarehouse1">
-                <el-option v-for="item in warehouseList1" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                <el-option v-for="item in warehouseList1" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item label="调出仓位" prop="position1">
               <el-select v-model="directForm.position1" placeholder="请调出仓位" style="width: 100%" filterable @change="changePosition1">
-                <el-option v-for="item in positionList1" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                <el-option v-for="item in positionList1" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item label="调入仓库" prop="warehouse2">
               <el-select v-model="directForm.warehouse2" placeholder="请选择调入仓库" style="width: 100%" filterable @change="changeWarehouse2">
-                <el-option v-for="item in warehouseList2" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                <el-option v-for="item in warehouseList2" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item label="调入仓位" prop="position2">
               <el-select v-model="directForm.position2" placeholder="请调入仓位" style="width: 100%" filterable @change="changePosition2">
-                <el-option v-for="item in positionList2" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                <el-option v-for="item in positionList2" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -345,27 +362,48 @@
 
       <div class="table" style="margin-top: 20px">
         <el-table :data="directGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
-          <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="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialOldNumber" 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="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="warehouse1" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="调出仓位" prop="position1" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="调入仓库" prop="warehouse2" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="调入仓位" prop="position2" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="调出库存状态" prop="status1" min-width="110" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="调入库存状态" prop="status2" min-width="110" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="调出货主" min-width="100" show-overflow-tooltip>
+          <el-table-column align="left" label="序号" type="index" width="50" />
+          <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip />
+          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="160" 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="160" 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="160" 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 align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip />
+          <el-table-column align="left" label="调出仓库" prop="warehouse1" min-width="100" show-overflow-tooltip />
+          <el-table-column align="left" label="调出仓位" prop="position1" min-width="100" show-overflow-tooltip />
+          <el-table-column align="left" label="调入仓库" prop="warehouse2" min-width="100" show-overflow-tooltip />
+          <el-table-column align="left" label="调入仓位" prop="position2" min-width="100" show-overflow-tooltip />
+          <el-table-column align="left" label="调出库存状态" prop="status1" min-width="110" show-overflow-tooltip />
+          <el-table-column align="left" label="调入库存状态" prop="status2" min-width="110" show-overflow-tooltip />
+          <el-table-column align="left" label="调出货主" min-width="100" show-overflow-tooltip>
             <template slot-scope="">弘格</template>
           </el-table-column>
-          <el-table-column align="center" label="调入货主" min-width="100" show-overflow-tooltip>
+          <el-table-column align="left" label="调入货主" min-width="100" show-overflow-tooltip>
             <template slot-="scope">弘格</template>
           </el-table-column>
-          <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip />
         </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -394,24 +432,24 @@
               />
             </el-form-item>
           </el-col>
-<!--          <el-col :xs="8" :sm="8" :lg="8">-->
-<!--            <el-form-item label="发货仓库" prop="warehouse">-->
-<!--              <el-select-->
-<!--                v-model="deliverForm.warehouse"-->
-<!--                placeholder="请选择发货仓库"-->
-<!--                style="width: 100%"-->
-<!--                filterable-->
-<!--                @change="changeWarehouse"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in warehouseList"-->
-<!--                  :key="item.id"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.id"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :xs="8" :sm="8" :lg="8">-->
+          <!--            <el-form-item label="发货仓库" prop="warehouse">-->
+          <!--              <el-select-->
+          <!--                v-model="deliverForm.warehouse"-->
+          <!--                placeholder="请选择发货仓库"-->
+          <!--                style="width: 100%"-->
+          <!--                filterable-->
+          <!--                @change="changeWarehouse"-->
+          <!--              >-->
+          <!--                <el-option-->
+          <!--                  v-for="item in warehouseList"-->
+          <!--                  :key="item.id"-->
+          <!--                  :label="item.name"-->
+          <!--                  :value="item.id"-->
+          <!--                />-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :xs="8" :sm="8" :lg="8">
             <el-form-item label="选择仓位" prop="position">
               <el-select
@@ -445,62 +483,78 @@
           :summary-method="$getSummaries"
         >
           <el-table-column
-            align="center"
+            align="left"
             label="序号"
             type="index"
             width="50"
           />
           <el-table-column
-            align="center"
+            align="left"
             label="销售类型"
             prop="saleTypeName"
             min-width="100"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="left"
             label="物料编码"
             prop="materialCode"
             min-width="160"
             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="center"
+            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="center"
+            align="left"
             label="规格型号"
             prop="specification"
             min-width="160"
             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="center"
+            align="left"
             label="单位"
             prop="unit"
             min-width="100"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="订单数量"
             prop="refundableQty"
             min-width="100"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="发货数量"
             prop="hasSendQty"
             min-width="100"
             show-overflow-tooltip
           />
           <el-table-column
-            align="center"
+            align="right"
             label="直调数量"
             prop="adjustNum"
             min-width="100"
@@ -516,7 +570,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="单价"
             prop="price"
             min-width="100"
@@ -527,7 +581,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="金额"
             prop="totalAmount"
             min-width="100"
@@ -538,7 +592,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="返利"
             prop="payRebateAmount"
             min-width="100"
@@ -550,7 +604,7 @@
           </el-table-column>
 
           <el-table-column
-            align="center"
+            align="left"
             label="备注"
             prop="remark"
             min-width="160"
@@ -563,7 +617,7 @@
         <el-button type="primary" @click="submitDeliverForm">确 定</el-button>
       </span>
     </el-dialog>
-    <CheckOrder :checkOrderId="checkOrderId" v-if="isShowCheckOrder" @backDetail="backDetail" />
+    <CheckOrder v-if="isShowCheckOrder" :check-order-id="checkOrderId" @backDetail="backDetail" />
   </div>
 </template>
 
@@ -577,18 +631,22 @@ export default {
   name: 'RetailDetail',
   componentName: 'RetailDetail',
   components: {
-    CheckOrder,
+    CheckOrder
   },
   filters: {
-    statusFilter(val) {
+    statusFilter(val, time) {
       const statusList = [
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
         { label: '审核驳回', value: 'FAIL' }
       ]
-      const obj = statusList.find((o) => o.value == val)
-      return obj ? obj.label : ''
+      const obj = statusList.find((o) => o.value === val)
+      if (!time) {
+        return obj ? obj.label : ''
+      } else {
+        return val === 'SAVE' && time ? '驳回' : obj.label
+      }
     }
   },
   props: ['listItem'],
@@ -598,7 +656,7 @@ export default {
       isShowDeliverDialog: false,
       deliverForm: {
         date: '',
-        position: '',
+        position: ''
       },
       deliverFormRules: {
         date: [
@@ -606,7 +664,7 @@ export default {
         ],
         position: [
           { required: true, message: '请选择虚拟仓位', trigger: 'change' }
-        ],
+        ]
       },
       positionList: [],
       goodsList: [],
@@ -615,7 +673,7 @@ export default {
         warehouse1: '',
         position1: '',
         warehouse2: '',
-        position2: '',
+        position2: ''
       },
       directFormRules: {
         warehouse1: [
@@ -629,16 +687,16 @@ export default {
         ],
         position2: [
           { required: true, message: '请选择调入仓位', trigger: 'change' }
-        ],
+        ]
       },
       warehouseList1: [],
       warehouseList2: [],
       positionList1: [],
       positionList2: [],
       directGoodsList: [],
-      status:false,
+      status: false,
       checkOrderId: {},
-      isShowCheckOrder: false,
+      isShowCheckOrder: false
     }
   },
 
@@ -657,10 +715,9 @@ export default {
         this.detailData.examineStatus === 'OK' ||
         this.detailData.examineStatus === 'FAIL'
       )
-
     },
     isDealer() {
-      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+      return JSON.parse(localStorage.getItem('supply_user')).isCustomer
     },
     progress() {
       if (this.detailData.totalQty == 0) return 0
@@ -761,9 +818,9 @@ export default {
       getPositionList({
         pageNum: 1,
         pageSize: -1,
-        type:2
+        type: 2
       }).then(res => {
-        this.positionList = res.data.records;
+        this.positionList = res.data.records
       })
     },
     // 关闭 直调发货
@@ -772,31 +829,31 @@ export default {
     },
     // 联查单据
     toCheckOrder() {
-      this.checkOrderId = this.detailData.id;
-      this.isShowCheckOrder = true;
+      this.checkOrderId = this.detailData.id
+      this.isShowCheckOrder = true
     },
     // 关闭 提前开票
     closeDirectDialog() {
-      this.isShowDirectDialog = false;
+      this.isShowDirectDialog = false
     },
     // 更改调出仓库
     changeWarehouse1() {
-      this.directForm.position1 = '';
-      let obj = this.warehouseList1.find(o => o.id == this.directForm.warehouse1);
-      this.positionList1 = obj.kingDeeStocks;
+      this.directForm.position1 = ''
+      const obj = this.warehouseList1.find(o => o.id == this.directForm.warehouse1)
+      this.positionList1 = obj.kingDeeStocks
       this.directGoodsList.forEach(item => {
-        item.warehouse1 = obj.name;
-      });
+        item.warehouse1 = obj.name
+      })
     },
 
     // 更改调入仓库
     changeWarehouse2() {
-      this.directForm.position2 = '';
-      let obj = this.warehouseList2.find(o => o.id == this.directForm.warehouse2);
-      this.positionList2 = obj.kingDeeStocks;
+      this.directForm.position2 = ''
+      const obj = this.warehouseList2.find(o => o.id == this.directForm.warehouse2)
+      this.positionList2 = obj.kingDeeStocks
       this.directGoodsList.forEach(item => {
-        item.warehouse2 = obj.name;
-      });
+        item.warehouse2 = obj.name
+      })
     },
     // 获取仓库列表
     getWarehouseList() {
@@ -804,37 +861,37 @@ export default {
         pageNum: 1,
         pageSize: -1
       }).then(res => {
-        this.warehouseList1 = res.data.records;
-        this.warehouseList2 = res.data.records;
+        this.warehouseList1 = res.data.records
+        this.warehouseList2 = res.data.records
       })
     },
 
     // 更改调出仓位
     changePosition1() {
-      let obj = this.positionList1.find(o => o.id == this.directForm.position1);
+      const obj = this.positionList1.find(o => o.id == this.directForm.position1)
       this.directGoodsList.forEach(item => {
-        item.position1 = obj.name;
-        item.status1 = obj.defStockStatusName;
-      });
+        item.position1 = obj.name
+        item.status1 = obj.defStockStatusName
+      })
     },
 
     // 更改调入仓位
     changePosition2() {
-      let obj = this.positionList2.find(o => o.id == this.directForm.position2);
+      const obj = this.positionList2.find(o => o.id == this.directForm.position2)
       this.directGoodsList.forEach(item => {
-        item.position2 = obj.name;
-        item.status2 = obj.defStockStatusName;
-      });
+        item.position2 = obj.name
+        item.status2 = obj.defStockStatusName
+      })
     },
     // 提交 提前开票
     submitDirectForm() {
       this.$refs.directForm.validate((valid) => {
         if (valid) {
-          let warehouseItem1 = this.warehouseList1.find(o => o.id == this.directForm.warehouse1);
-          let positionItem1 = this.positionList1.find(o => o.id == this.directForm.position1);
-          let warehouseItem2 = this.warehouseList2.find(o => o.id == this.directForm.warehouse2);
-          let positionItem2 = this.positionList2.find(o => o.id == this.directForm.position2);
-          let params = {
+          const warehouseItem1 = this.warehouseList1.find(o => o.id == this.directForm.warehouse1)
+          const positionItem1 = this.positionList1.find(o => o.id == this.directForm.position1)
+          const warehouseItem2 = this.warehouseList2.find(o => o.id == this.directForm.warehouse2)
+          const positionItem2 = this.positionList2.find(o => o.id == this.directForm.position2)
+          const params = {
             orderNo: this.detailData.id,
             orderType: 'RETAIL', // TRADE=商用 HOME=家用 RETAIL=零售单 RETAIL_POLICY 销售政策单
             correspondId: this.directForm.warehouse1,
@@ -844,18 +901,18 @@ export default {
             inCorrespondId: this.directForm.warehouse2,
             inCorrespondName: warehouseItem2.name,
             inStockId: this.directForm.position2,
-            inStockName: positionItem2.name,
+            inStockName: positionItem2.name
           }
           directOrder(params).then(res => {
-            this.$successMsg();
-            this.isShowDirectDialog = false;
-            this.getDetail();
+            this.$successMsg()
+            this.isShowDirectDialog = false
+            this.getDetail()
           })
         }
       })
     },
     backDetail() {
-      this.isShowCheckOrder = false;
+      this.isShowCheckOrder = false
     },
 
     // 提交 直调发货
@@ -893,11 +950,10 @@ export default {
     },
     // 打开 提前开票
     openDirectDialog() {
-      this.isShowDirectDialog = true;
-      this.directGoodsList = this.detailData.retailOrderItemList;
-      this.getWarehouseList();
-    },
-
+      this.isShowDirectDialog = true
+      this.directGoodsList = this.detailData.retailOrderItemList
+      this.getWarehouseList()
+    }
 
   }
 }

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

@@ -120,70 +120,84 @@
         max-height="400"
       >
         <el-table-column
-          align="center"
+          align="left"
           label="序号"
           type="index"
           width="50"
         />
         <el-table-column
-          align="center"
+          align="left"
           label="销售类型"
           prop="saleTypeName"
           min-width="100"
           show-overflow-tooltip
         />
         <el-table-column
-          align="center"
+          align="left"
           label="物料编码"
           prop="materialNumber"
-          min-width="100"
+          min-width="200"
           show-overflow-tooltip
         >
-          <template slot-scope="scope">
-            {{ scope.row.materialNumber?scope.row.materialNumber:scope.row.materialCode }}
-          </template>
+
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialNumber?scope.row.materialNumber:scope.row.materialCode " />
+              <span> {{ scope.row.materialNumber?scope.row.materialNumber:scope.row.materialCode }}</span>
+            </template>
+
+
         </el-table-column>
         <el-table-column
-          align="center"
+          align="left"
           label="产品名称"
           prop="materialName"
-          min-width="160"
+          min-width="200"
           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="center"
+          align="left"
           label="规格型号"
           prop="specification"
-          min-width="160"
+          min-width="200"
           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="center"
+          align="left"
           label="单位"
           prop="unit"
           min-width="100"
           show-overflow-tooltip
         />
         <el-table-column
-          align="center"
+          align="right"
           label="单价"
           prop="price"
           min-width="100"
           show-overflow-tooltip
         />
         <el-table-column
-          align="center"
+          align="right"
           label="总数量"
           prop="qty"
           min-width="100"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-input v-model="scope.row.qty" size="small" />
+            <el-input class="yinput" v-model="scope.row.qty" size="small" />
           </template>
         </el-table-column>
         <el-table-column
-          align="center"
+          align="right"
           label="订单金额"
           min-width="100"
           show-overflow-tooltip
@@ -193,7 +207,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          align="center"
+          align="left"
           label="返利钱包"
           prop="customerWalletId2"
           min-width="160"
@@ -219,7 +233,7 @@
         </el-table-column>
 
         <el-table-column
-          align="center"
+          align="right"
           label="返利金额"
           min-width="100"
           show-overflow-tooltip
@@ -231,7 +245,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          align="center"
+          align="right"
           label="格力折扣"
           min-width="100"
           show-overflow-tooltip
@@ -242,7 +256,7 @@
         </el-table-column>
 
         <el-table-column
-          align="center"
+          align="left"
           label="现金钱包"
           prop="customerWalletId"
           min-width="160"
@@ -266,7 +280,7 @@
           </template>
         </el-table-column>
         <!--        <el-table-column-->
-        <!--          align="center"-->
+        <!--          align="left"-->
         <!--          label="业务员"-->
         <!--          prop="retiredQty"-->
         <!--          min-width="160"-->
@@ -292,7 +306,7 @@
         <!--          </template>-->
         <!--        </el-table-column>-->
         <el-table-column
-          align="center"
+          align="right"
           label="可用返利"
           prop="amount"
           min-width="100"
@@ -305,7 +319,7 @@
 
         </el-table-column>
         <el-table-column
-          align="center"
+          align="right"
           label="实付金额"
           prop="qty"
           min-width="100"
@@ -321,7 +335,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          align="center"
+          align="left"
           label="是否直调"
           prop="isDirectTransfer"
           min-width="100"
@@ -331,7 +345,7 @@
           </template>
         </el-table-column>
         <!-- <el-table-column
-          align="center"
+          align="left"
           label="直调数量"
           prop="directTransferQty"
           min-width="100"
@@ -344,7 +358,7 @@
           </template>
         </el-table-column> -->
         <el-table-column
-          align="center"
+          align="left"
           label="备注"
           prop="remark"
           min-width="160"
@@ -354,7 +368,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          align="center"
+          align="right"
           label="税率"
           prop="tax"
           min-width="100"
@@ -362,7 +376,7 @@
         />
         <!--        <el-table-column-->
         <!--          v-if="!listItem"-->
-        <!--          align="center"-->
+        <!--          align="left"-->
         <!--          label="总仓库"-->
         <!--          prop="status1"-->
         <!--          min-width="100"-->
@@ -374,7 +388,7 @@
         <!--        </el-table-column>-->
         <el-table-column
           v-if="!listItem"
-          align="center"
+          align="left"
           label="仓库状态"
           prop="status2"
           min-width="100"
@@ -384,7 +398,7 @@
             <div>{{ status2Filter(scope.row) }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作" width="100" fixed="right">
+        <el-table-column align="left" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <!-- <el-button
               type="text"
@@ -430,7 +444,7 @@
             引用销售政策说明：{{ !remark ? factor[0].name : remark }} 配提比列：{{ pop }}
           </el-row>
           <el-row :gutter="20">
-            <el-col :xs="24" :sm="6" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="11">
               <el-form-item label="销售政策">
                 <el-select
                   v-model="screenForm.policyId"
@@ -447,7 +461,7 @@
                     :value="item.code"
                   />
                 </el-select> </el-form-item></el-col>
-            <!-- <el-col :xs="24" :sm="6" :lg="6">
+            <!-- <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="条件">
                 <el-select
                   v-model="screenForm.factorId"
@@ -465,7 +479,7 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
-            <el-col :xs="24" :sm="6" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="11">
               <el-form-item label="销售类型">
                 <el-select
                   v-model="screenForm.saleTypeCode"
@@ -485,7 +499,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-col :xs="24" :sm="12" :lg="2" class="tr">
               <el-button
                 type="primary"
                 size="small"
@@ -515,7 +529,7 @@
               @selection-change="handleSelectionChange($event, 1, index)"
             >
               <el-table-column
-                align="center"
+                align="left"
                 type="selection"
                 :selectable="selectable"
                 width="55"
@@ -523,7 +537,7 @@
               <template v-for="col in columns">
                 <el-table-column
                   v-if="col.num"
-                  align="center"
+                  :align="col.align"
                   :label="col.lable"
                   :prop="col.prop"
                   :min-width="col.widht"
@@ -534,6 +548,7 @@
                       v-model.lazy="scope.row.qty"
                       type="number"
                       size="small"
+                      class="yinput"
                       @blur="blurQty(scope.row.qty, scope.row)"
                       @input="funQty(scope.row.qty, scope.row, index)"
                     />
@@ -541,7 +556,7 @@
                 </el-table-column>
                 <el-table-column
                   v-else-if="col.jie"
-                  align="center"
+                  :align="col.align"
                   :label="col.lable"
                   :prop="col.prop"
                   :min-width="col.widht"
@@ -553,12 +568,22 @@
                 </el-table-column>
                 <el-table-column
                   v-else
-                  align="center"
+                  :align="col.align"
                   :label="col.lable"
                   :prop="col.prop"
                   :min-width="col.widht"
                   show-overflow-tooltip
-                />
+                >
+                  <template slot-scope="scope">
+                    <template v-if="col.lable=='产品名称' || col.lable =='规格型号'">
+                      <CopyButton :copyText="scope.row[col.prop]" />
+                      <span>   {{ scope.row[col.prop]}}</span>
+                    </template>
+                    <template v-else>
+                      {{ scope.row[col.prop]}}
+                    </template>
+                  </template>
+                </el-table-column>
               </template>
               <template #append>
                 <div class="mybox">
@@ -615,7 +640,7 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column
-              align="center"
+              align="left"
               type="selection"
               :selectable="selectable2"
               width="55"
@@ -623,7 +648,7 @@
             <template v-for="col in columns">
               <el-table-column
                 v-if="col.num"
-                align="center"
+                :align="col.align"
                 :label="col.lable"
                 :prop="col.prop"
                 :min-width="col.widht"
@@ -633,6 +658,7 @@
                   <el-input
                     v-model.lazy="scope.row.qty"
                     type="number"
+                    class="yinput"
                     size="small"
                     @blur="blurQty(scope.row.qty, scope.row)"
                     @input="funQty(scope.row.qty, scope.row)"
@@ -641,7 +667,7 @@
               </el-table-column>
               <el-table-column
                 v-else-if="col.jie"
-                align="center"
+                :align="col.align"
                 :label="col.lable"
                 :prop="col.prop"
                 :min-width="col.widht"
@@ -653,12 +679,22 @@
               </el-table-column>
               <el-table-column
                 v-else
-                align="center"
+                :align="col.align"
                 :label="col.lable"
                 :prop="col.prop"
                 :min-width="col.widht"
                 show-overflow-tooltip
-              />
+              >
+                <template slot-scope="scope">
+                  <template v-if="col.lable=='产品名称' || col.lable =='规格型号'">
+                    <CopyButton :copyText="scope.row[col.prop]" />
+                    <span>     {{ scope.row[col.prop]}}</span>
+                  </template>
+                  <template v-else>
+                    {{ scope.row[col.prop]}}
+                  </template>
+                </template>
+              </el-table-column>
             </template>
             <template #append>
               <div class="mybox">
@@ -783,35 +819,41 @@ export default {
         {
           prop: 'saleTypeName',
           lable: '销售类型',
-          widht: 160
+          widht: 200,
+          align:'left'
         },
         {
           prop: 'materialName',
-          lable: '货品名称',
-          widht: 160
+          lable: '产品名称',
+          widht: 200,
+          align:'left'
         },
         {
           prop: 'specification',
           lable: '规格型号',
-          widht: 160
+          widht: 200,
+          align:'left'
         },
 
         {
           prop: 'qty',
           lable: '数量',
-          widht: 160,
-          num: true
+          widht: 200,
+          num: true,
+          align:'right'
         },
         {
           prop: 'price',
           lable: '单价',
-          widht: 160
+          widht: 200,
+          align:'right'
         },
         {
           prop: 'zong',
-          widht: 160,
+          widht: 200,
           lable: '金额',
-          jie: true
+          jie: true,
+          align:'right'
         }
       ],
       listLoading: false,
@@ -1790,6 +1832,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.yinput{
+  ::v-deep .el-input__inner{
+    text-align: right;
+  }
+}
 .fr {
   margin: 10px;
   overflow: hidden;
@@ -1812,13 +1859,14 @@ export default {
 }
 .mybox {
   padding: 20px 0;
-
+  text-align: right;
   div:first-child {
     flex: 0 0 55px;
   }
   div {
-    flex: 1 0 160px;
-    text-align: center;
+    flex: 1 0 200px;
+    padding-right: 10px;
+    text-align: right;
   }
 }
 

src/views/supply/policy/policy_list.vue

@@ -166,14 +166,14 @@
               </template>
             </el-table-column> -->
             <el-table-column
-              align="center"
+              align="left"
               label="订单号"
               prop="id"
               min-width="180"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="订单日期"
               prop="theTime"
               min-width="150"
@@ -193,56 +193,79 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="销售政策编号"
               prop="policyCode"
-              min-width="100"
+              min-width="200"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="销售政策说明"
               prop="policyTitle"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="经销商"
               prop="customerName"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{scope.row.customerName}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="物料编码"
               prop="materialCode"
               min-width="160"
               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="center"
+              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="center"
+              align="left"
               label="规格型号"
               prop="specification"
-              min-width="160"
+              min-width="300"
               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="center"
+              align="left"
               label="计量单位"
               prop="unit"
               min-width="100"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="是否直调"
               prop="isDirectTransfer"
               min-width="100"
@@ -253,16 +276,15 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="总数量"
-
               prop="qty"
               min-width="100"
               show-overflow-tooltip
             />
 
             <el-table-column
-              align="center"
+              align="right"
               label="单价"
               prop="price"
               min-width="100"
@@ -273,7 +295,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="实付金额"
               sortable
               prop="payAmount"
@@ -285,7 +307,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="left"
               label="返利类型"
               prop="customerWalletName2"
               min-width="100"
@@ -303,7 +325,7 @@
             </el-table-column>
 
             <el-table-column
-              align="center"
+              align="right"
               label="返利金额"
               sortable
               prop="rebateAmount"
@@ -316,7 +338,7 @@
             </el-table-column>
 
             <el-table-column
-              align="center"
+              align="right"
               label="格力折扣"
               sortable
               prop="totalDiscAmount"
@@ -328,56 +350,56 @@
                 {{ scope.row.totalDiscAmount | numToFixed }}
               </template></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="直调数量"
               prop="directTransferQty"
               min-width="100"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="right"
               label="出库数量"
               prop="hasSendQty"
               min-width="100"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="业务员"
               prop="k3ServiceName"
               min-width="100"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="制表人"
               prop="createName"
               min-width="100"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="制表日期"
               prop="createTime"
-              min-width="160"
+              min-width="200"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="审核人"
               prop="examineName"
-              min-width="100"
+              min-width="200"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="审核日期"
               prop="examineTime"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
-              align="center"
+              align="left"
               label="审核状态"
               prop="examineStatus"
               min-width="100"