feat(订单管理): 在销售订单和采购订单中添加签订日期字段

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

@@ -241,6 +241,18 @@
               :init="false"
             />
           </el-form-item>
+          <el-form-item label="签订日期" prop="contractStartDate">
+            <el-date-picker
+              v-model="form.contractStartDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              :clearable="false"
+              placeholder="选择日期"
+              style="width: 100%"
+            >
+            </el-date-picker>
+          </el-form-item>
           <el-form-item prop="orderFiles" label="附件">
             <fileMain v-model="form.orderFiles"></fileMain>
           </el-form-item>
@@ -754,6 +766,7 @@
   import purchaseReturnOrderDialog from '@/views/transportManager/shipManage/dispatchManage/components/purchaseReturnOrderDialog.vue';
   import PaymentCollectionPlan from '@/BIZComponents/paymentCollectionPlan/Index.vue'
   import { shippingModePurchaseOp, transactionMethodsOp } from '@/enum/dict.js';
+  import { formatDate } from '@/utils/dateUtils';
 
   export default {
     mixins: [dictMixins],
@@ -838,7 +851,8 @@
         settlementDate: [],
         endSettlementDate: '',
         startSettlementDate: '',
-        receiptDate: 1
+        receiptDate: 1,
+        contractStartDate:''
       };
 
       return {
@@ -1827,7 +1841,8 @@
           contractNo: obj.contractNo,
           relationId: obj.id,
           relationName: obj.contractName,
-          relationCode: obj.contractNo
+          relationCode: obj.contractNo,
+          contractStartDate: obj.contractStartDate,
         });
 
         await this.getPlanInfo(this.form.contractId);
@@ -1965,6 +1980,7 @@
               }
             })
           }
+          this.form.contractStartDate = formatDate(new Date(), 'yyyy-MM-dd');
         } else {
           this.isUpdate = true;
           await this.getpurchaseorderDetail(row.id);

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

@@ -226,6 +226,9 @@
             <el-form-item label="采购员：" prop="purchaseUserName">
               <el-input v-model="form.purchaseUserName" disabled></el-input>
             </el-form-item>
+            <el-form-item label="签订日期：" prop="contractStartDate">
+              <el-input v-model="form.contractStartDate" disabled></el-input>
+            </el-form-item>
             <el-form-item label="优惠后总金额：" prop="payAmount">
               <el-input v-model="form.payAmount" disabled>
                 <template slot="append">元</template>

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

@@ -97,6 +97,10 @@
             <el-input v-model="form.createDeptName" :disabled="true"></el-input>
           </el-form-item>
 
+          <el-form-item prop="orderFiles" label="订单附件">
+            <fileMain v-model="form.orderFiles"></fileMain>
+          </el-form-item>
+
           <!-- <el-form-item prop="productionRequirements" label="备注">
             <el-input
               clearable
@@ -238,6 +242,19 @@
             />
           </el-form-item>
 
+          <el-form-item label="签订日期" prop="contractStartDate">
+            <el-date-picker
+              v-model="form.contractStartDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              :clearable="false"
+              placeholder="选择日期"
+              style="width: 100%"
+            >
+            </el-date-picker>
+          </el-form-item>
+
           <el-form-item
             label="业务员"
             prop="salesmanId"
@@ -266,11 +283,9 @@
               </template>
             </el-input>
           </el-form-item>
-
-          <el-form-item prop="orderFiles" label="订单附件">
-            <fileMain v-model="form.orderFiles"></fileMain>
-          </el-form-item>
         </el-col>
+
+
         <el-col :span="8">
           <el-form-item label="交易方式" prop="transactionMode">
             <el-select
@@ -314,14 +329,6 @@
             </DictSelection>
           </el-form-item>
           <el-form-item v-if="form.settlementMode == 1" label="结算日期范围" prop="settlementDate">
-            <!-- <el-date-picker
-              v-model="form.contractStartDate"
-              @change="setDeliveryDays"
-              type="date"
-              placeholder="选择日期"
-              style="width: 100%"
-            >
-            </el-date-picker> -->
             <el-date-picker
               style="width: 100%"
               v-model="form.settlementDate"
@@ -726,6 +733,7 @@
 
 <script>
   import { emailReg, numberReg, telReg } from 'ele-admin';
+  import { formatDate } from '@/utils/dateUtils';
   import inventoryTable from '@/BIZComponents/inventoryTable.vue';
   import fileUpload from '@/components/upload/fileUpload';
   import dictMixins from '@/mixins/dictMixins';
@@ -863,7 +871,8 @@
         deliveryMode: 1,
         settlementDate: [],
         endSettlementDate: '',
-        startSettlementDate: ''
+        startSettlementDate: '',
+        contractStartDate: ''
       };
 
       return {
@@ -1095,7 +1104,7 @@
       getGroupAll() {
         const apiRequest = this.clientEnvironmentId == 6 ? listOrganizationsNew({deptIds: ['1998632792148717569', '1998632872721297409']}) : listOrganizations();
         apiRequest.then((list) => {
-          console.log('listOrganizations', list);
+          // console.log('listOrganizations', list);
           this.groupData = list;
           this.groupTreeData = this.$util.toTreeData({
             data: list,
@@ -1339,6 +1348,7 @@
               issueNumber,
               endSettlementDate,
               deliveryMode,
+              contractStartDate
             } = contractVO;
             if(businessDeptId){
               this.getSalesmanUser(businessDeptId);
@@ -1386,6 +1396,7 @@
                 issueNumber,
                 endSettlementDate,
                 deliveryMode,
+                contractStartDate,
                 settlementDate: startSettlementDate ? [startSettlementDate, endSettlementDate] : [],
               },
               !row
@@ -1617,11 +1628,13 @@
 
       //选择合同回调
       changeContract(obj) {
+        console.log('obj~~~', obj);
         this.form = Object.assign({}, this.form, {
           contractId: obj.id,
           contractName: obj.contractName,
           relationType: 3,
-          productionRequirements: obj.productionRequirements
+          productionRequirements: obj.productionRequirements,
+          contractStartDate: obj.contractStartDate,
         });
         this.getDetailData(obj.id);
         this.$store.commit('order/setContractId', obj.id);
@@ -1680,7 +1693,8 @@
           relationType,
           orderFiles,
           remark,
-          createDeptName: this.user.info.groupName
+          createDeptName: this.user.info.groupName,
+          contractStartDate: formatDate(new Date(), 'yyyy-MM-dd')
         });
         this.projectData = {};
 
@@ -1732,6 +1746,7 @@
             this.changeParent({ id: this.contactData.id });
           }
           this.form.createDeptName = this.user.info.groupName;
+          this.form.contractStartDate = formatDate(new Date(), 'yyyy-MM-dd');
           this.form.saleType = 1;
           this.$nextTick(() => {
             this.issueNumberChange(this.form.issueNumber);

src/views/saleManage/saleOrder/components/darwerComponents/saleOrderInfo.vue

@@ -157,6 +157,9 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="签订日期：" prop="contractStartDate">
+            <el-input v-model="form.contractStartDate" disabled></el-input>
+          </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item