Merge branch 'feat_sale' into dev_03

src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -2215,6 +2215,7 @@
         this.visible = true;
         this.isUpdate = false;
         this.form.relationType = 4;
+        // this.form.isGenerateReceiptPlan = +this.isGenReceiptPlan;
         this.changeContract(row);
       },
       handleGoodsList() {

src/views/saleManage/saleOrder/accountstatement/components/saleForm.vue

@@ -204,6 +204,11 @@
       </el-col>
     </el-row>
     <el-row>
+      <el-col :span="8" v-if="dialogType == 'view'">
+        <el-form-item prop="contactName" label="客户名称">
+          <el-input disabled v-model="dataForm.contactName"></el-input>
+        </el-form-item>
+      </el-col>
       <el-col :span="8" v-if="dialogType == 'view'">
         <el-form-item prop="createTime" label="对账时间">
           <el-input disabled v-model="dataForm.createTime"></el-input>

src/views/saleManage/saleOrder/components/addDialogNew.vue

@@ -1964,6 +1964,7 @@
           this.form.partbAddress = this.enterprisePage[0].address;
         }
         this.form.createDeptName = this.user.info.groupName;
+        this.form.isGenerateReceiptPlan = +this.isGenReceiptPlan;
         await this.changeContract(row);
       },
       getEnterprisePage() {