货权方改为客户

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1,27 +1,33 @@
 <template>
   <div>
-    <div style="display: flex; align-items: center">
-      <el-breadcrumb separator="/">
-        <el-breadcrumb-item
-          ><span style="font-weight: 700">入库</span></el-breadcrumb-item
-        >
-        <el-breadcrumb-item
-          ><span style="font-weight: 700">入库详情页</span></el-breadcrumb-item
+    <div style="display:flex;justify-content: space-between;">
+      <div style="display: flex; align-items: center">
+        <el-breadcrumb separator="/">
+          <el-breadcrumb-item
+            ><span style="font-weight: 700">入库</span></el-breadcrumb-item
+          >
+          <el-breadcrumb-item
+            ><span style="font-weight: 700"
+              >入库详情页</span
+            ></el-breadcrumb-item
+          >
+        </el-breadcrumb>
+        <el-button
+          style="margin-left: 10px"
+          size="mini"
+          icon="el-icon-arrow-left"
+          @click="goBack"
+          >返回列表</el-button
         >
-      </el-breadcrumb>
-      <el-button
-        style="margin-left: 10px"
-        size="mini"
-        icon="el-icon-arrow-left"
-        @click="goBack"
-        >返回列表</el-button
-      >
+      </div>
+      <!-- <el-button icon="el-icon-refresh" circle size="mini"></el-button> -->
     </div>
+
     <br />
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="货权方" prop="fCorpid">
+          <el-form-item label="客户" prop="fCorpid">
             <el-select
               v-model="form.fCorpid"
               clearable
@@ -961,14 +967,17 @@
                 <span v-else-if="item.label == 'fBsdate'">
                   {{ scope.row.fBsdate | fBsdateFormat }}
                 </span>
-                 <span v-else-if="item.label == 'fGoodsid'">
-                  {{ scope.row.fGoodsid | goodsFormat(goodsOptions)}}
+                <span v-else-if="item.label == 'fGoodsid'">
+                  {{ scope.row.fGoodsid | goodsFormat(goodsOptions) }}
                 </span>
-                  <span v-else-if="item.label == 'fBusinessType'">
-                  {{ scope.row.fBusinessType | fStorageTypeFormat(fStorageTypeOptions)}}
+                <span v-else-if="item.label == 'fBusinessType'">
+                  {{
+                    scope.row.fBusinessType
+                      | fStorageTypeFormat(fStorageTypeOptions)
+                  }}
                 </span>
-                 <span v-else-if="item.label == 'fCntrtype'">
-                  {{ scope.row.fCntrtype | fCntrtypeFormat(cntrList)}}
+                <span v-else-if="item.label == 'fCntrtype'">
+                  {{ scope.row.fCntrtype | fCntrtypeFormat(cntrList) }}
                 </span>
                 <span v-else>{{ scope.row[item.label] }}</span>
               </template>
@@ -982,10 +991,7 @@
             >
               <template slot-scope="scope">
                 <el-button
-                  :disabled="
-                    browseStatus ||
-                    scope.row.fBillstatus > 30
-                  "
+                  :disabled="browseStatus || scope.row.fBillstatus > 30"
                   type="text"
                   @click.native.prevent="fixRow(scope.row, scope.$index)"
                   size="small"
@@ -2343,7 +2349,7 @@
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
             <tr>
-              <td>货权方</td>
+              <td>客户</td>
               <td>{{ form.fCorpidName }}</td>
               <td>仓库</td>
               <td>{{ form.fWarehouseids }}</td>
@@ -3449,16 +3455,16 @@ export default {
       }
       return name;
     },
-    fStorageTypeFormat(row,fStorageTypeOptions) {
+    fStorageTypeFormat(row, fStorageTypeOptions) {
       let fStorageType;
       fStorageTypeOptions.map((e) => {
-        if (row== e.dictValue) {
+        if (row == e.dictValue) {
           fStorageType = e.dictLabel;
         }
       });
       return fStorageType;
     },
-    fCntrtypeFormat(row,cntrList) {
+    fCntrtypeFormat(row, cntrList) {
       let fCntrtype;
       cntrList.map((e) => {
         if (row == e.fId) {
@@ -3467,7 +3473,7 @@ export default {
       });
       return fCntrtype;
     },
-    goodsFormat(row,goodsOptions) {
+    goodsFormat(row, goodsOptions) {
       let goods;
       goodsOptions.map((e) => {
         if (row == e.fId) {
@@ -3487,7 +3493,7 @@ export default {
       }
     },
     fBillstatusFormat(row) {
-      let Name
+      let Name;
       switch (row) {
         case 10:
           Name = "计划";
@@ -4487,7 +4493,7 @@ export default {
     handleSelect(key) {
       if (!this.form.fCorpid) {
         this.$message({
-          message: "请维护货权方",
+          message: "请维护客户",
           type: "warning",
         });
       } else if (this.form.fProductName == undefined) {
@@ -4595,6 +4601,9 @@ export default {
           });
           if (status == "copy") {
             this.importList.fBsdate = Date.parse(this.Printinglist[0].fBsdate);
+            if (!this.importList.fBsdate) {
+              this.importList.fBsdate = this.Printinglist[0].fBsdate;
+            }
             this.importList.fGoodsid = this.Printinglist[0].fGoodsid;
             this.importList.fBusinessType = this.Printinglist[0].fBusinessType.toString();
             this.importList.fMarks = this.Printinglist[0].fMarks;

src/views/Warehousing/inStock/index.vue

@@ -10,7 +10,7 @@
       >
         <el-row>
           <el-col :span="6">
-            <el-form-item label="货权方" prop="fCorpid">
+            <el-form-item label="客户" prop="fCorpid">
               <el-select
                 v-model="queryParams.fCorpid"
                 clearable
@@ -560,7 +560,7 @@ export default {
         {
           surface: "4",
           label: "fCorpid",
-          name: "货权方",
+          name: "客户",
           checked: 0,
           fixed: "left",
           width: 100,

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -21,7 +21,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="货权方" prop="fCorpid">
+          <el-form-item label="客户" prop="fCorpid">
             <el-select
               v-model="form.fCorpid"
               clearable
@@ -2059,7 +2059,7 @@
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
             <tr>
-              <td>货权方</td>
+              <td>客户</td>
               <td>{{ form.fCorpidName }}</td>
               <td>仓库</td>
               <td>{{ form.fWarehouseids }}</td>
@@ -4058,7 +4058,7 @@ export default {
     handleSelect(key) {
       if (!this.form.fCorpid) {
         this.$message({
-          message: "请维护货权方",
+          message: "请维护客户",
           type: "warning",
         });
       } else if (this.form.fProductName == undefined) {

src/views/Warehousing/outStock/index.vue

@@ -10,7 +10,7 @@
       >
         <el-row>
           <el-col :span="6">
-            <el-form-item label="货权方" prop="fCorpid">
+            <el-form-item label="客户" prop="fCorpid">
               <el-select
                 v-model="queryParams.fCorpid"
                 clearable
@@ -578,7 +578,7 @@ export default {
         {
           surface: "4",
           label: "fCorpid",
-          name: "货权方",
+          name: "客户",
           checked: 0,
           width: 100,
         },

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -21,7 +21,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="货权方" prop="fCorpid">
+          <el-form-item label="客户" prop="fCorpid">
             <el-select
               v-model="form.fCorpid"
               clearable
@@ -2087,7 +2087,7 @@
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
             <tr>
-              <td>货权方</td>
+              <td>客户</td>
               <td>{{ form.fCorpidName }}</td>
               <td>仓库</td>
               <td>{{ form.fWarehouseids }}</td>
@@ -3780,7 +3780,7 @@ export default {
     handleSelect(key) {
       if (!this.form.fCorpid) {
         this.$message({
-          message: "请维护货权方",
+          message: "请维护客户",
           type: "warning",
         });
       } else if (this.form.fProductName == undefined) {

src/views/Warehousing/stockTransfer/index.vue

@@ -10,7 +10,7 @@
       >
         <el-row>
           <el-col :span="6">
-            <el-form-item label="货权方" prop="fCorpid">
+            <el-form-item label="客户" prop="fCorpid">
               <el-select
                 v-model="queryParams.fCorpid"
                 clearable
@@ -579,7 +579,7 @@ export default {
         {
           surface: "4",
           label: "fCorpid",
-          name: "货权方",
+          name: "客户",
           checked: 0,
           width: 100,
         },

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -51,7 +51,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="货权方" prop="fCorpid">
+      <el-form-item label="客户" prop="fCorpid">
         <el-select
           v-model="queryParams.fCorpid"
           filterable
@@ -60,7 +60,7 @@
           style="width: 200px"
           @keyup.enter.native="handleQuery"
           :remote-method="corpsRemoteMethod"
-          placeholder="请选择货权方"
+          placeholder="请选择客户"
         >
           <el-option
             v-for="(dict, index) in fMblnoOptions"
@@ -353,8 +353,8 @@
         sortable
       />
       <!--      <el-table-column  label="制单人" align="center" prop="createBy" fixed />-->
-      <!--      <el-table-column width="220" label="货权方" sortable align="center" prop="fCorpid" fixed/>-->
-      <!--      <el-table-column width="220" label="转货权方" sortable align="center" prop="fTocorpid" fixed/>-->
+      <!--      <el-table-column width="220" label="客户" sortable align="center" prop="fCorpid" fixed/>-->
+      <!--      <el-table-column width="220" label="转客户" sortable align="center" prop="fTocorpid" fixed/>-->
       <!--      <el-table-column label="品名" :show-overflow-tooltip="true" align="ceter" prop="fProductName" fixed/>-->
       <!--      <el-table-column :show-overflow-tooltip="true" label="品牌" align="center" prop="fMarks" fixed/>-->
       <!--      <el-table-column width="160" label="业务编号" align="center" prop="fBillno" fixed/>-->
@@ -488,7 +488,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="货权方" prop="fCorpid">
+            <el-form-item label="客户" prop="fCorpid">
               <el-select
                 v-model="form.fCorpid"
                 filterable
@@ -496,7 +496,7 @@
                 :disabled="notChange || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="corpsRemoteMethod"
-                placeholder="请选择货权方"
+                placeholder="请选择客户"
               >
                 <el-option
                   v-for="(dict, index) in fMblnoOptions"
@@ -508,7 +508,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="新货权方" prop="fTocorpid">
+            <el-form-item label="新客户" prop="fTocorpid">
               <el-select
                 v-model="form.fTocorpid"
                 filterable
@@ -517,7 +517,7 @@
                 style="width: 80%"
                 @change="changefCorpid(form)"
                 :remote-method="corpsRemoteMethod"
-                placeholder="请选择新货权方"
+                placeholder="请选择新客户"
               >
                 <el-option
                   v-for="(dict, index) in fMblnoOptions"
@@ -2152,14 +2152,14 @@ export default {
         {
           surface: "2",
           label: "fCorpid",
-          name: "货权方",
+          name: "客户",
           checked: 0,
           width: 100,
         },
         {
           surface: "3",
           label: "fTocorpid",
-          name: "转货权方",
+          name: "转客户",
           checked: 0,
           width: 100,
         },
@@ -2252,14 +2252,14 @@ export default {
         {
           surface: "2",
           label: "fCorpid",
-          name: "货权方",
+          name: "客户",
           checked: 0,
           width: 100,
         },
         {
           surface: "3",
           label: "fTocorpid",
-          name: "转货权方",
+          name: "转客户",
           checked: 0,
           width: 100,
         },
@@ -2391,9 +2391,9 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 货权方(客户数据)
+      // 客户(客户数据)
       fMblnoOptions: [],
-      // 货权方(客户数据)
+      // 客户(客户数据)
       // 客户名称
       KHblnoOptions: [],
       fSbuOptions: [],
@@ -2937,7 +2937,7 @@ export default {
             !this.form.fWarehouseid
           ) {
             this.$message({
-              message: "请维护货权方、贸易方式、仓库",
+              message: "请维护客户、贸易方式、仓库",
               type: "warning",
             });
             return false;
@@ -3751,7 +3751,7 @@ export default {
             this.formBrowseStatus = true;
             this.$refs["form"].validate((valid) => {
               if (this.form.fCorpid === this.form.fTocorpid) {
-                this.$message.error("新货权方不得与货权方一致");
+                this.$message.error("新客户不得与客户一致");
                 return false;
               }
               // if (this.dataList.length === 0) {
@@ -3956,7 +3956,7 @@ export default {
       this.updateDeduplication();
       this.$refs["form"].validate((valid) => {
         if (this.form.fCorpid === this.form.fTocorpid) {
-          this.$message.error("新货权方不得与货权方一致");
+          this.$message.error("新客户不得与客户一致");
           return false;
         }
         // if (this.dataList.length === 0) {
@@ -4060,7 +4060,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (this.form.fCorpid === this.form.fTocorpid) {
-          this.$message.error("新货权方不得与货权方一致");
+          this.$message.error("新客户不得与客户一致");
           return false;
         }
         if (this.dataList.length === 0) {
@@ -4313,7 +4313,7 @@ export default {
         );
       }
     },
-    // 选择新货权方自动带出结算方式
+    // 选择新客户自动带出结算方式
     changefCorpid(row) {
       this.$set(row, "fSbu", row.fCorpid);
       for (let corp in this.fMblnoOptions) {