仓库名称

src/views/purchasingManage/purchaseOrder/accountstatement/components/purchaseForm.vue

@@ -211,6 +211,8 @@
       ref="selectContractRef"
       @changeParent="changeContract"
       :type="2"
+      :isAdd="true"
+
     ></contractListDialog>
   </el-form>
 </template>

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

@@ -24,7 +24,6 @@
       :contactData="contactData"
       :saleOrderData="saleOrderData"
       :recorpayList.sync="recorpayList"
-
       :dialogType="dialogType"
       ref="saleFormRef"
     ></sale-form>
@@ -32,20 +31,20 @@
       <template v-slot>
         <el-row style="font-weight: 700; color: red">
           <span>总金额：</span>
-            <span>{{ dataForm.amountTotalPrice || 0 }}</span>
-            <el-divider direction="vertical"></el-divider>
-            <span>应收金额：</span>
-            <span>{{ dataForm.amountReceivablePrice || 0 }}</span>
-            <el-divider direction="vertical"></el-divider>
-            <span>已收金额：</span>
-            <span>{{ dataForm.amountReceivablePass||0 }}</span>
-            <el-divider direction="vertical"></el-divider>
-            <span>应付金额：</span>
-            <span>{{ dataForm.amountPayablePrice || 0 }}</span>
-      
-            <el-divider direction="vertical"></el-divider>
-            <span>已付金额：</span>
-            <span>{{ dataForm.amountPayablePass||0 }}</span>
+          <span>{{ dataForm.amountTotalPrice || 0 }}</span>
+          <el-divider direction="vertical"></el-divider>
+          <span>应收金额：</span>
+          <span>{{ dataForm.amountReceivablePrice || 0 }}</span>
+          <el-divider direction="vertical"></el-divider>
+          <span>已收金额：</span>
+          <span>{{ dataForm.amountReceivablePass || 0 }}</span>
+          <el-divider direction="vertical"></el-divider>
+          <span>应付金额：</span>
+          <span>{{ dataForm.amountPayablePrice || 0 }}</span>
+
+          <el-divider direction="vertical"></el-divider>
+          <span>已付金额：</span>
+          <span>{{ dataForm.amountPayablePass || 0 }}</span>
         </el-row>
       </template>
     </headerTitle>
@@ -90,7 +89,7 @@
 <script>
   import InventoryTable from '@/views/saleManage/saleOrder/accountstatement/components/inventoryTable.vue';
   import recorpayTableList from '@/views/saleManage/saleOrder/accountstatement/components/recorpayTableList.vue';
-  
+
   import saleForm from '@/views/saleManage/saleOrder/accountstatement/components/saleForm.vue';
   import {
     getSearchMergeListByTypeAPI,
@@ -106,7 +105,8 @@
       processSubmitDialog,
       InventoryTable,
       saleForm,
-      modalTitle,recorpayTableList
+      modalTitle,
+      recorpayTableList
     },
     //客户管理数据
     props: {
@@ -131,7 +131,7 @@
       return {
         fullscreen: false,
         datasource: [],
-        recorpayList:[],
+        recorpayList: [],
         dataForm: {
           sourceType: 1,
           dateType: 1,
@@ -183,30 +183,33 @@
       //获取对账单详情
       async getInfo(row) {
         let data = await infoAccountStatementAPI(row.id);
-        this.recorpayList = data.recorpayList||[];
+        this.recorpayList = data.recorpayList || [];
         this.datasource = data.orderList || [];
         this.dataForm = data;
         switch (this.dataForm.dateType) {
           case 1:
-            this.dataForm.year = this.dataForm.dateValue;
+            // this.dataForm.year = this.dataForm.dateValue;
+            this.$set(this.dataForm, 'year', this.dataForm.dateValue);
             break;
           case 2:
             //2023年-四季度
             let data = this.dataForm.dateValue.split('年-');
-            this.dataForm.year = data[0];
-            this.dataForm.quarter = data[1];
+
+            this.$set(this.dataForm, 'year', data[0]);
+            this.$set(this.dataForm, 'quarter', data[1]);
             break;
           case 3:
-            this.dataForm.month = this.dataForm.dateValue;
+            this.$set(this.dataForm, 'month', this.dataForm.dateValue);
+
             break;
           default:
             this.dataForm.dateValue = '';
-            this.dataForm.dateTimeRange = [
+            this.$set(this.dataForm, 'dateTimeRange', [
               this.dataForm.startDate,
               this.dataForm.endDate
-            ];
+            ]);
         }
-        this.$forceUpdate()
+        this.$forceUpdate();
       },
       //关闭弹窗
       cancel() {
@@ -222,7 +225,7 @@
           type: 1
         };
         let data = await getSearchMergeListByTypeAPI(searchQuery);
-        console.log(data,'data')
+        console.log(data, 'data');
 
         this.datasource = data.orderList || [];
         this.recorpayList = data.recorpayList || [];
@@ -232,9 +235,9 @@
           amountReceivablePrice: data.amountReceivablePrice,
           amountTotalPrice: data.amountTotalPrice,
           amountPayablePass: data.amountPayablePass,
-          amountReceivablePass: data.amountReceivablePass,
+          amountReceivablePass: data.amountReceivablePass
         };
-        this.$forceUpdate()
+        this.$forceUpdate();
         if (!this.datasource.length) this.$message.warning('暂无订单信息');
       },
       //保存
@@ -248,7 +251,7 @@
         let params = {
           ...this.dataForm,
           orderList: this.datasource,
-          recorpayList:this.recorpayList
+          recorpayList: this.recorpayList
         };
         let data = await api(params);
         if (is == 'sub') {

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

@@ -74,15 +74,13 @@
               minWidth: 140,
               prop: 'sourceName',
               label: '来源名称',
-              slot: 'sourceCode',
               align: 'center',
               showOverflowTooltip: true
             },
             {
               minWidth: 140,
-              prop: 'sourceName',
+              prop: 'sourceCode',
               label: '来源编码',
-              slot: 'sourceCode',
               align: 'center',
               showOverflowTooltip: true
             },

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

@@ -14,6 +14,8 @@
           >
             <el-option label="客户" :value="1" />
             <!--            <el-option label="项目" :value="2"/>-->
+            <el-option label="合同" :value="4" />
+
             <el-option label="销售订单" :value="3" />
           </el-select>
         </el-form-item>
@@ -39,11 +41,22 @@
           v-if="dataForm.sourceType == 3"
         >
           <el-input
-            :disabled="dialogType == 'view' || !!saleOrderData?.id"
-            v-model="dataForm.orderNo"
+          :disabled="dialogType == 'view'"
+            v-model="dataForm.sourceName"
             @click.native="handleGetOrd"
           ></el-input>
         </el-form-item>
+        <el-form-item
+          label="选择合同"
+          prop="contractId"
+          v-if="dataForm.sourceType == 4"
+        >
+          <el-input
+            :disabled="dialogType == 'view'"
+            v-model="dataForm.sourceName"
+            @click.native="handleGetContract"
+          ></el-input>
+        </el-form-item>
       </el-col>
     </el-row>
     <el-row>
@@ -191,6 +204,7 @@
       ref="selectContractRef"
       @changeParent="changeContract"
       :type="1"
+      :isAdd="true"
     ></contractListDialog>
   </el-form>
 </template>
@@ -333,8 +347,8 @@
           contractName: obj.contractName,
           sourceId: obj.id,
           sourceName: obj.contractName,
-          contactId: obj.partbId,
-          contactName: obj.partbName
+          contactId: obj.partaId,
+          contactName: obj.partaName
         });
         this.$emit('update:dataForm', params);
         this.reloadTableData();

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

@@ -99,6 +99,10 @@
       isChange: {
         default: false,
         type: Boolean
+      },
+      isAdd: { //对账单选择合同 
+        default: false,
+        type: Boolean
       }
     },
     data() {
@@ -325,7 +329,11 @@
           this.handleClose();
           return
         }
-
+        if (this.isAdd) {
+          this.$emit('changeParent', this.current, this.currentIndex);
+          this.handleClose();
+          return
+        }
         if (this.current.hasGeneratedOrder > 0 && !(await this.addConfirm())) {
           return;
         }

src/views/saleManage/saleOrder/index.vue

@@ -155,9 +155,9 @@
                     <el-dropdown-item command="invoice"
                       >创建发货单
                     </el-dropdown-item>
-                    <el-dropdown-item command="returnOrder"
+                    <!-- <el-dropdown-item command="returnOrder"
                       >创建退货单
-                    </el-dropdown-item>
+                    </el-dropdown-item> -->
                     <el-dropdown-item command="saleOrderReminder"
                       >催单
                     </el-dropdown-item>

src/views/saleManage/saleOrder/invoice/components/detailDialog.vue

@@ -386,9 +386,9 @@
           },
           {
             width: 200,
-            prop: 'warehouseId',
+            prop: 'warehouseName',
             label: '仓库名称',
-            slot: 'warehouseId',
+            slot: 'warehouseName',
 
             align: 'center'
           },