Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/reportForms/pro-progress-report.vue

@@ -8,7 +8,7 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="销售订单号">
-                <a-input placeholder="请输入销售订单号" v-model="queryParam.CSOCode"></a-input>
+                <a-input placeholder="请输入销售订单号" v-model="queryParam.cSOCode"></a-input>
               </a-form-item>
             </a-col>
 
@@ -20,20 +20,20 @@
 
             <a-col :md="6" :sm="8">
               <a-form-item label="物料名称">
-                <a-input placeholder="请输入物料名称" v-model="queryParam.CInvName"></a-input>
+                <a-input placeholder="请输入物料名称" v-model="queryParam.cInvName"></a-input>
               </a-form-item>
             </a-col>
 
             <template v-if="toggleSearchStatus">
               <a-col :md="6" :sm="8">
                 <a-form-item label="成衣加工厂">
-                  <a-input placeholder="请输入物料名称" v-model="queryParam.CDefine12"></a-input>
+                  <a-input placeholder="请输入物料名称" v-model="queryParam.cDefine12"></a-input>
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务员">
-                  <a-input placeholder="请输入业务员" v-model="queryParam.CPersonName"></a-input>
+                  <a-input placeholder="请输入业务员" v-model="queryParam.cPersonName"></a-input>
                 </a-form-item>
               </a-col>
 
@@ -43,7 +43,7 @@
                 </a-form-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-item label="订单日期" has-feedback>
                   <a-date-picker
                     style="width: 100%"
@@ -53,11 +53,22 @@
                     @change="onDateChange"
                   ></a-date-picker>
                 </a-form-item>
+              </a-col> -->
+              <a-col :md="6" :sm="8">
+                <a-form-item label="订单日期">
+                   <a-range-picker
+                  :placeholder="['开始时间', '结束时间']"
+                  format="YYYY-MM-DD"
+                  style="width: 100%"
+                  v-model="cSOCode"
+                  @change="dDateChange"
+                />
+                </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-item label="颜色">
-                  <a-input placeholder="请输入颜色" v-model="queryParam.color"></a-input>
+                <a-form-item label="款号">
+                  <a-input placeholder="请输入款号" v-model="queryParam.itemNumber"></a-input>
                 </a-form-item>
               </a-col>
 
@@ -146,50 +157,70 @@ export default {
       description: '生产进度报表',
       // 表头
       proProgressColumns: [
+      { title: '账套', width: 90, fixed: 'left', dataIndex: 'account', className: 'replacecolor' },
+
         {
           title: '销售订单号',
-          width: 310,
+          width: 280,
           fixed: 'left',
-          align: 'left',
+         // align: 'left',
           dataIndex: 'csocode',
           className: 'replacecolor',
           customCell: this.showDrawer,
           scopedSlots: { customRender: 'csocode' }
         },
-        {
-          title: '部门',
-          width: 100,
-          dataIndex: 'cdepName',
-          fixed: 'left',
-          className: 'replacecolor'
-        },
-        { title: '业务员', width: 90, fixed: 'left', dataIndex: 'cpersonName', className: 'replacecolor' },
-
-        { title: '计划单号', width: 280, dataIndex: 'planCode', align: 'left', className: 'replacecolor' },
+        { title: '款号', width: 100, dataIndex: 'itemNumber', className: 'replacecolor' },
+        { title: '计划单号', width: 100, dataIndex: 'planCode',  className: 'replacecolor' },
         {
           title: '成衣加工厂',
           width: 220,
           dataIndex: 'cdefine12',
           className: 'replacecolor'
         },
-        { title: '物料编码', width: 220, dataIndex: 'cinvCode', className: 'replacecolor' },
         {
           title: '物料名称',
-          width: 320,
+          width: 280,
           dataIndex: 'cinvName',
-          align: 'left',
+         
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
-        { title: '款号', width: 160, dataIndex: 'itemNumber', align: 'left', className: 'replacecolor' },
         {
           title: '颜色',
-          width: 220,
+          width: 120,
           dataIndex: 'color',
-          align: 'left',
+         
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
+        { title: '单价', width: 80, dataIndex: 'itaxUnitPrice', className: 'replacecolor' },
+        { title: '订单数量', width: 100, dataIndex: 'iquantity', className: 'replacecolor' },
+        { title: '入库数量', width: 100, dataIndex: 'finquantity', className: 'replacecolor' },
+        { title: '出库数量', width: 100, dataIndex: 'foutquantity', className: 'replacecolor' },
+        { title: '开票数量', width: 100, dataIndex: 'ikpquantity', className: 'replacecolor' },
+        {
+          title: '部门',
+          width: 80,
+          dataIndex: 'cdepName',
+          //fixed: 'left',
+          className: 'replacecolor'
+        },
+        { title: '业务员', width: 80,  dataIndex: 'cpersonName', className: 'replacecolor' },
+        {
+          title: '交期',
+          width: 100,
+          dataIndex: 'dpreDateBT',
+          customRender: text => {
+            return moment(text).format('YYYY-MM-DD')
+          },
+          className: 'replacecolor'
+        },
+      
+       
+        // { title: '物料编码', width: 220, dataIndex: 'cinvCode', className: 'replacecolor' },
+        
+       
+      
         // {
         //   title: '创建时间',
         //   dataIndex: 'createTime',
@@ -199,33 +230,25 @@ export default {
         //     return moment(text).format('YYYY-MM-DD')
         //   }
         // },
-        {
-          title: '交期',
-          width: 120,
-          dataIndex: 'dpreDateBT',
-          customRender: text => {
-            return moment(text).format('YYYY-MM-DD')
-          },
-          className: 'replacecolor'
-        },
-        { title: '订单数量', width: 180, dataIndex: 'iquantity', className: 'replacecolor' },
-        { title: '单价(原币)', width: 180, dataIndex: 'itaxUnitPrice', className: 'replacecolor' },
-        { title: '总额(原币)', width: 140, dataIndex: 'totalSum', className: 'replacecolor' },
-        { title: '单价(本币)', width: 180, dataIndex: 'bbPrice', className: 'replacecolor' },
-        { title: '总额(本币)', width: 140, dataIndex: 'inatSum', className: 'replacecolor' },
-        { title: '实际发票成本', width: 160, dataIndex: 'icostsum', className: 'replacecolor' },
-        { title: '已出库数量', width: 160, dataIndex: 'foutquantity', className: 'replacecolor' },
-        { title: '累计开票数量', width: 180, dataIndex: 'ikpquantity', className: 'replacecolor' },
+        
+       
+       
+        // { title: '总额(原币)', width: 140, dataIndex: 'totalSum', className: 'replacecolor' },
+        // { title: '单价(本币)', width: 180, dataIndex: 'bbPrice', className: 'replacecolor' },
+        // { title: '总额(本币)', width: 140, dataIndex: 'inatSum', className: 'replacecolor' },
+        // { title: '实际发票成本', width: 160, dataIndex: 'icostsum', className: 'replacecolor' },
+        
+        
         {
           title: '图片',
-          width: 90,
+          width: 70,
           dataIndex: 'image',
           customCell: this.picShow,
-          fixed: 'right',
+        
           className: 'replacecolor',
           scopedSlots: { customRender: 'imageslot' }
         },
-        { title: '附件', width: 120, dataIndex: 'accessory', fixed: 'right', className: 'replacecolor' }
+        { title: '附件', width: 70, dataIndex: 'accessory',  className: 'replacecolor' }
       ],
       proProgressData: [], //生产进度数据
       loading: false, // 表格加载
@@ -235,6 +258,7 @@ export default {
         // pageSize: 0
       },
       preDeliveryDate:[],
+      cSOCode:[],
       // 查询条件
       queryParam: {
         // pageNo: '',
@@ -335,6 +359,7 @@ export default {
       // this.queryParam.accId='903'
       this.preDeliveryDate = []
       this.proProgressData =[]
+      this.cSOCode = []
       // this.getproProgressList()
     },
 
@@ -352,6 +377,10 @@ export default {
       this.queryParam.dPreDateB = dateString[0]
       this.queryParam.dPreDateE = dateString[1]
     },
+    dDateChange(value, dateString) {
+      this.queryParam.dDateB = dateString[0]
+      this.queryParam.dDateE = dateString[1]
+    },
   }
 }
 </script>