计划单统计表调整

src/views/cost-allocation-total/inancialReconciliation.vue

@@ -126,6 +126,19 @@
                 <a-input placeholder="请输入" v-model="queryParam.cbPlanMan"></a-input>
               </a-form-item>
             </a-col>
+
+            
+            <a-col :md="6" :sm="8">
+              <a-form-item label="通知时间">
+                <a-range-picker
+                  :placeholder="['开始时间', '结束时间']"
+                  format="YYYY-MM-DD"
+                  v-model="readyEndDate" 
+                  @change="changeReadyEndDate"
+                />
+              </a-form-item>
+            </a-col>
+
             </template>
 
             <a-col :md="6" :sm="8">
@@ -164,6 +177,12 @@
              <a-input placeholder="请输入" v-model="record.remarks" v-if="record.enter=='1'"></a-input>
              <span v-if="record.enter=='0'">{{ record.remarks }}</span>
           </span>
+          
+         <span slot="planNumType" slot-scope="text, record">
+             <a-input placeholder="请输入" v-model="record.planNumType" v-if="record.enter=='1'"></a-input>
+             <span v-if="record.enter=='0'">{{ record.planNumType }}</span>
+          </span>
+
           <span slot="planMan" slot-scope="text, record">
             <a-input placeholder="请输入" v-model="record.planMan" v-if="record.enter=='1'"></a-input>
             <span v-if="record.enter=='0'">{{ record.planMan }}</span>
@@ -178,6 +197,10 @@
             <span v-if="record.enter=='0'">{{text}}</span>
         </span>
         
+        <span slot="readyNoticeDate" slot-scope="text, record">
+          <a-date-picker style="width: 100%" v-model="record.readyNoticeDate"   :format="dateFormat" v-if="record.enter=='1'" @change="changeReadyEndData()"> </a-date-picker>
+            <span v-if="record.enter=='0'">{{text}}</span>
+        </span>
         <span slot="option" slot-scope="text, record">
             <a :disabled="record.enter=='0'" @click="sava(record)"> 保存</a>
             <a-divider type="vertical" />
@@ -214,6 +237,7 @@ export default {
       dverifyDate:[],
       ffirstApproveDate:[],
       ffinalApproveDate:[],
+      readyEndDate:[],
       costAllocationColumns: [
         { title: '计划单号', width: 120, dataIndex: 'planNo', fixed: 'left', className: 'replacecolor' },
         { title: '日期', width: 120, dataIndex: 'dverifyDate', className: 'replacecolor' },
@@ -232,7 +256,7 @@ export default {
       },
         { title: '业务员', width: 120, dataIndex: 'salesman', className: 'replacecolor' },
         { title: '计划师傅/制单人', width: 150, dataIndex: 'maker', className: 'replacecolor'},
-        { title: '对单人(手输人)', width: 220, dataIndex: 'planMan', align: 'left', className: 'replacecolor',
+        { title: '对单人(手输人)', width: 150, dataIndex: 'planMan', align: 'left', className: 'replacecolor',
         scopedSlots: { customRender: 'planMan' },
         sorter:(a,b)=> {
                   let temp1="";
@@ -246,8 +270,8 @@ export default {
                   return temp1.localeCompare(temp2);
               },
          },
-        { title: '面损表审核人', width: 150, dataIndex: 'msPlanMan', className: 'replacecolor'},
-        { title: '成本表审核人', width: 150, dataIndex: 'cbPlanMan', className: 'replacecolor'},
+        { title: '面损表审核人', width: 120, dataIndex: 'msPlanMan', className: 'replacecolor'},
+        { title: '成本表审核人', width: 120, dataIndex: 'cbPlanMan', className: 'replacecolor'},
         //  {
         //   title: '创建时间',
         //   dataIndex: 'createTime',
@@ -257,6 +281,29 @@ export default {
         //     return moment(text).format('YYYY-MM-DD')
         //   }
         // },
+        {
+          title: '通知时间',
+          width: 170,
+          dataIndex: 'readyEndDate',
+          scopedSlots: { customRender: 'readyEndDate' },
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.readyEndDate) > new Date(b.readyEndDate) ? 1 : -1;
+          },
+        }, 
+        {
+          title: '成衣通知时间',
+          width: 170,
+          dataIndex: 'readyNoticeDate',
+          scopedSlots: { customRender: 'readyNoticeDate' },
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.readyNoticeDate) > new Date(b.readyNoticeDate) ? 1 : -1;
+          },
+        },
+
+         
+
         {
           title: '交单日期',
           width: 120,
@@ -327,6 +374,8 @@ export default {
             return new Date(a.ffinalApproveDate) > new Date(b.ffinalApproveDate) ? 1 : -1;
           },
         },
+ 
+
         { title: '面损表单据状态', width: 120, dataIndex: 'fstatus', className: 'replacecolor',
         sorter:(a,b)=> {
                   let temp1="";
@@ -357,16 +406,6 @@ export default {
             return new Date(a.csubmitDate) > new Date(b.csubmitDate) ? 1 : -1;
           },
         },
-        {
-          title: '刷成衣结束日期',
-          width: 170,
-          dataIndex: 'readyEndDate',
-          scopedSlots: { customRender: 'readyEndDate' },
-          className: 'replacecolor',
-          sorter: (a, b) => {
-            return new Date(a.readyEndDate) > new Date(b.readyEndDate) ? 1 : -1;
-          },
-        },
         {
           title: '返单日期',
           width: 120,
@@ -414,6 +453,15 @@ export default {
                   return temp1.localeCompare(temp2);
               },
        },
+       
+       {
+          title: '计划单类型',
+          width: 150,
+          dataIndex: 'planNumType',
+          className: 'replacecolor',
+          scopedSlots: { customRender: 'planNumType' },
+        },
+
         {
           title: '备注',
           width: 180,
@@ -519,6 +567,11 @@ export default {
         this.queryParam.ffinalApproveDateE=(this.ffinalApproveDate.length==2)?this.ffinalApproveDate[1].format('YYYY-MM-DD'):''
         this.queryParam.ffinalApproveDateB=( this.ffinalApproveDate.length==2)?this.ffinalApproveDate[0].format('YYYY-MM-DD'):''
     },
+    changeReadyEndDate(){
+        this.queryParam.readyEndDateE=(this.readyEndDate.length==2)?this.readyEndDate[1].format('YYYY-MM-DD'):''
+        this.queryParam.readyEndDateB=( this.readyEndDate.length==2)?this.readyEndDate[0].format('YYYY-MM-DD'):''
+    },
+    
     rowClick(record)  {
       return {
         on: {
@@ -541,6 +594,10 @@ export default {
         planNum : record.planNo,
         planMan:record.planMan,
         remarks:record.remarks,
+        
+        readyNoticeDate: record.readyNoticeDate!==''&&record.readyNoticeDate ? moment(record.readyNoticeDate).format('YYYY-MM-DD'):'',
+        planNumType:record.planNumType,
+
         id:record.id,
         readyEndDate: record.readyEndDate!==''&&record.readyEndDate ? moment(record.readyEndDate).format('YYYY-MM-DD HH:mm:ss'):''
       }