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

src/views/book/addBookDrawer.vue

@@ -252,7 +252,7 @@
               :data-source="addBookData"
               :loading="loading"
               :pagination="false"
-              :scroll="{ x: 1300,y: 350 }"
+              :scroll="{ x: 1500,y: 350 }"
               @change="handleTableChange"
             >
              <!-- 自定义表头 -->
@@ -486,7 +486,7 @@ export default {
          {
           title: '小po',
           dataIndex: 'smallPo',
-          width: 100,
+          width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },
@@ -1153,7 +1153,7 @@ export default {
          {
           title: '小po',
           dataIndex: 'smallPo',
-          width: 100,
+          width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },

src/views/book/book-list.vue

@@ -71,7 +71,30 @@
                 <!-- <a-date-picker style="width: 100%" v-model="queryParam.shippingOrderDate" @change="orderDataChange" > </a-date-picker> -->
               </a-form-item>
             </a-col>
-            
+            <a-col :md="5" :sm="8">
+                <a-form-item label="船期">
+                  <a-date-picker
+                    placeholder="请选择"
+                    style="width:100%;"
+                    format="YYYY-MM-DD"
+                    v-model="queryParam.theFinalShippingDate"
+                  />
+                </a-form-item>
+              </a-col>
+              <a-col :md="5" :sm="8">
+                <a-form-item label="供应商">
+                    <j-search-select-tag
+                        placeholder="请选择供应商"
+                        v-model="queryParam.supplier"
+                        dict="view_supplier,supplier,supplier">
+                    </j-search-select-tag>
+                </a-form-item>
+              </a-col>
+              <a-col :md="5" :sm="8">
+                <a-form-item label="款号">
+                  <a-input placeholder="请输入款号" v-model="queryParam.styleNum"></a-input>
+                </a-form-item>
+              </a-col>
               <a-col :md="5" :sm="8">
                 <a-form-item label="外销发票">
                   <a-input placeholder="请输入外销发票" v-model="queryParam.exportInvoiceNo"></a-input>
@@ -222,8 +245,17 @@ export default {
       // 表头
       bookListColumns: [
         { title: '托书号', width: 150, dataIndex: 'shippingOrderNumber',  className: 'replacecolor' , ellipsis: true,fixed: 'left'},
+        {
+          title: '实际船期',
+          dataIndex: 'theFinalShippingDate',
+           ellipsis: true,
+          width: 110,
+          // customRender: text => { 有问题 显示当日日期
+          //   return moment(text).format('YYYY-MM-DD')
+          // },
+          className: 'replacecolor'
+        },
         { title: '成衣工厂', width: 150, dataIndex: 'garmentFactory', className: 'replacecolor', ellipsis: true, },
-        
         { title: '客户简称', dataIndex: 'clientAbbreviation', width: 120, className: 'replacecolor' , ellipsis: true,},
         {
           title: '分销点',
@@ -250,17 +282,6 @@ export default {
            ellipsis: true,
           className: 'replacecolor'
         },
-
-        {
-          title: '实际船期',
-          dataIndex: 'theFinalShippingDate',
-           ellipsis: true,
-          width: 110,
-          // customRender: text => { 有问题 显示当日日期
-          //   return moment(text).format('YYYY-MM-DD')
-          // },
-          className: 'replacecolor'
-        },
         { title: '外销发票号码', dataIndex: 'exportInvoiceNo', width: 120, className: 'replacecolor', ellipsis: true, },
         {
           title: '发票推送状态',

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

@@ -914,7 +914,7 @@ export default {
       if(this.costPayData[this.costPayData.length-1].setNo=='合计'){this.costPayData.pop()}
        this.costPayData.push(obj)
       }
-      this.detailsPlanNum.shuiemoney = shuiemoneyAll.toFixed(3)
+      this.detailsPlanNum.shuiemoney = shuiemoneyAll.toFixed(2)
       this.detailsPlanNum.rmbNorTaxExpense = Number(obj.disbursedLocalmoney).toFixed(2)
       this.detailsPlanNum.rmbExpense = Number(obj.iNatMoney).toFixed(2)
       this.detailsPlanNum.usdExpense = (Number(this.detailsPlanNum.rmbNorTaxExpense)/Number(this.detailsPlanNum.exchangeRate)).toFixed(2)

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

@@ -212,7 +212,6 @@ export default {
           dataIndex: 'outdata',
           customRender: text => {
             if(text!==''&&text){
-              
               return moment(parseInt(text)).format('YYYY-MM-DD')
             }else{
               return ''

src/views/cost-allocation-total/modal/ingInQuaModal.vue

@@ -13,7 +13,7 @@
     <a-spin :spinning="confirmLoading">
       <a-table :loading="loading" bordered :columns="columns" :data-source="data" :pagination="false"> 
         <span slot="unitCost" slot-scope="text,record">
-              <a-input placeholder="请输入" v-model="record.unitCost"  @change="changeUnitCost(record)"/>
+              <a-input placeholder="请输入" v-model="record.unitCost"  @blur="changeUnitCost(record)"/>
         </span>
       </a-table>
       <!-- 导出 打印 返回  -->
@@ -142,6 +142,7 @@ export default {
     // 打印
     print() {},
     changeUnitCost(record){
+      record.unitCost = Number(record.unitCost).toFixed(4)
       record.cost = record.unitCost*record.number
     },
 

src/views/packing-list/packinglist-fabrics/addFabricDrawer.vue

@@ -601,7 +601,7 @@ export default {
           dataIndex: 'price',
           width: 120,
           className: 'replacecolor',
-           scopedSlots: { customRender: 'price' },
+          //  scopedSlots: { customRender: 'price' },
           ellipsis: true,
         },
         {

src/views/reportForms/cost-allocation-table.vue

@@ -857,7 +857,7 @@ export default {
       if(this.costPayData[this.costPayData.length-1].setNo=='合计'){this.costPayData.pop()}
        this.costPayData.push(obj)
       }
-      this.detailsPlanNum.shuiemoney = shuiemoneyAll.toFixed(3)
+      this.detailsPlanNum.shuiemoney = shuiemoneyAll.toFixed(2)
       this.detailsPlanNum.rmbNorTaxExpense = Number(obj.disbursedLocalmoney).toFixed(2)
       this.detailsPlanNum.rmbExpense = Number(obj.iNatMoney).toFixed(2)
       this.detailsPlanNum.usdExpense = (Number(this.detailsPlanNum.rmbNorTaxExpense)/Number(this.detailsPlanNum.exchangeRate)).toFixed(2)

src/views/reportForms/cost-allocation-table/tabs.vue

@@ -24,16 +24,16 @@
             </span>
             <!-- 面料 -转入数量 弹框-->
             <span slot="fabInQuaSlot" slot-scope="text">
-              <a>{{ Number(text).toFixed(4)}}</a>
+              <a>{{ Number(text).toFixed(2)}}</a>
             </span>
 
             <!-- 余下数量-->
             <span slot="fabRemaQuaSlot" slot-scope="text">
-              <a>{{ Number(text).toFixed(4) }}</a>
+              <a>{{ Number(text).toFixed(2) }}</a>
             </span>
-            <!-- 余下数量-->
+            <!-- 多发少发-->
             <span slot="pilosityFewerSlot" slot-scope="text">
-              <a>{{ Number(text).toFixed(4) }}</a>
+              <a>{{text?Number(text).toFixed(2):'' }}</a>
             </span>
             <!-- 备注 -->
             <span slot="remarks" slot-scope="text,record">
@@ -66,7 +66,7 @@
             </span>
             <!--辅料-余下数量 弹框-->
             <span slot="ingRemQuaSlot" slot-scope="text">
-              <a v-if="text!==''">{{ Number(text).toFixed(4) }}</a>
+              <a v-if="text!==''">{{ Number(text).toFixed(2) }}</a>
             </span>
             <!-- 备注 -->
             <span slot="remarks" slot-scope="text,record">
@@ -177,15 +177,15 @@
     <!-- tabs内弹框 -->
     <div>
       <!-- 面料 转入数量 -->
-      <fabInQua-modal ref="fabInQuaModal" :father="aa"  :planNum="this.planNum"  @close="closeFabInQua"></fabInQua-modal>
+      <fabInQua-modal ref="fabInQuaModal"   :planNum="this.planNum"  @close="closeFabInQua"></fabInQua-modal>
 
       <!-- 余下数量 -->
-      <fabRemQua-modal ref="fabRemQuaModal" :father="bb" :planNum="this.planNum" @close="closeFabRemQuaModal"></fabRemQua-modal>
+      <fabRemQua-modal ref="fabRemQuaModal"  :planNum="this.planNum" @close="closeFabRemQuaModal"></fabRemQua-modal>
 
       <!-- 辅料 转入数量 -->
-      <ingInQua-modal ref="ingInQuaModal" :father="cc" :planNum="this.planNum" @close="closeIngInQua"></ingInQua-modal>
+      <ingInQua-modal ref="ingInQuaModal"  :planNum="this.planNum" @close="closeIngInQua"></ingInQua-modal>
       <!-- 余下数量 -->
-      <ingRemQua-modal ref="ingRemQuaModal" :father="bb" :planNum="this.planNum"></ingRemQua-modal>
+      <ingRemQua-modal ref="ingRemQuaModal"  :planNum="this.planNum"></ingRemQua-modal>
       <pilosity-fewer-list-modal ref="pilosityFewerListModal" :planNum="this.planNum"></pilosity-fewer-list-modal>
       <submit-information  ref="submitInformation" @close="closeRemark" :showAll="showAll=='yes'?'yes':'no'"></submit-information>
     </div>
@@ -269,7 +269,7 @@ export default {
           className: 'replacecolor' ,
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              return Number(text).toFixed(2)
             }
           },
         },
@@ -280,7 +280,7 @@ export default {
           className: 'replacecolor' ,
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              return Number(text).toFixed(2)
             }
           },
           },
@@ -291,7 +291,7 @@ export default {
           className: 'replacecolor',
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              return Number(text).toFixed(2)
             }
           },
         },
@@ -310,7 +310,7 @@ export default {
           className: 'replacecolor',
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              return Number(text).toFixed(2)
             }
           },
         },
@@ -399,7 +399,7 @@ export default {
           className: 'replacecolor',
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              return Number(text).toFixed(2)
             }
           },
          },
@@ -410,7 +410,7 @@ export default {
           className: 'replacecolor',
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              return Number(text).toFixed(2)
             }
           },
         },
@@ -549,7 +549,7 @@ export default {
           className: 'replacecolor',
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              return Number(text).toFixed(2)
             }
           },
         },
@@ -560,7 +560,7 @@ export default {
           className: 'replacecolor',
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              return Number(text).toFixed(2)
             }
           },
         },
@@ -593,7 +593,7 @@ export default {
           className: 'replacecolor',
           customRender: (text, record, index) => {
             if(text!==''&&text){
-              return Number(text).toFixed(4)
+              return Number(text).toFixed(2)
             }
           },
         },
@@ -762,6 +762,11 @@ export default {
             this.$refs.fabRemQuaModal.fabRemQuaModVis = true
             this.$refs.fabRemQuaModal.recordF = record
             this.$refs.fabRemQuaModal.data = record.syRemaining
+            this.$refs.fabRemQuaModal.data.map(item=>{
+              if(item.unitCost){
+                 item.unitCost =  Number(item.unitCost).toFixed(4)
+              }
+            })
             // if(this.mList.length!==0){
             //   this.mList.map(item=>{
             //     if(item.goodsName == record.goodsName && item.syRemaining.length!==0){
@@ -798,7 +803,7 @@ export default {
             this.$refs.ingInQuaModal.record = record
             record.syTransfers.map(item=>{
               if(item.unitCost){
-               item.unitCost =  (item.unitCost).toFixed(3)
+               item.unitCost =  (item.unitCost).toFixed(4)
               }
             })
             this.$refs.ingInQuaModal.data = record.syTransfers

src/views/shipment-details/shipmentList.vue

@@ -184,7 +184,7 @@
       </div>
       
       <!-- 测试 -->
-      <ve-table :columns="columns" :virtual-scroll-option="virtualScrollOption"  :max-height="600" :table-data="shipmentListData" style="width:100%" :border-y="true" :sort-option="sortOption" :scroll-width="2500"  row-key-field-name="itemIds"   :checkbox-option="checkboxOption">
+      <ve-table :columns="columns" :rowSelection="{ fixed: true, columnWidth: 60 }" :virtual-scroll-option="virtualScrollOption"  :max-height="600" :table-data="shipmentListData" style="width:100%" :border-y="true" :sort-option="sortOption" :scroll-width="2500"  row-key-field-name="itemIds"   :checkbox-option="checkboxOption">
       </ve-table>
       <div v-show="showEmpty" class="empty-data">暂无数据</div>
       <span style="margin-right: 55%;">共勾选{{selectedNumber}}条数</span>
@@ -580,7 +580,7 @@ export default {
       },
 
       columns: [
-          {field: "",key: "ju",type: "checkbox",title: "",width: 50, align: "center",ellipsis: {showTitle: true,},},
+          {field: "",key: "ju",type: "checkbox",title: "",width: 50, align: "center",fixed: "left",ellipsis: {showTitle: true,},},
           { field: "account", key: "a", title: "账套", align: "center", width: 85,sortBy: "",ellipsis: {showTitle: true,},},
           { field: "orderNumber", key: "b", title: "销售订单号", align: "center",width: 180,sortBy: "",ellipsis: {showTitle: true,}, },
           { field: "itemNumber", key: "c", title: "款号", align: "center",width: 130,sortBy: "",ellipsis: {showTitle: true,}, },
@@ -1146,20 +1146,42 @@ export default {
       })
     },
     sortChange(params) {
-                this.shipmentListData.sort((a, b) => {
-                  for (var key in params) {
-                   if(params[key]){
-                    if (params[key] === "asc") {
-                            return a[key] - b[key];
-                        } else if (params[key] === "desc") {
-                            return b[key] - a[key];
-                        } else {
-                            return 0;
-                        }
-                   }
-                  }
-                });
-            },
+      this.shipmentListData.sort((a, b) => {
+        for (var key in params) {
+          if(params[key]){
+            if (params[key] === "asc") {
+              if (!isNaN(a[key]) && !isNaN(b[key])) {
+                // 如果都是数字，按数字排序
+                return a[key] - b[key];
+              } else if (!isNaN(a[key]) || !isNaN(b[key])) {
+                // 如果一个是数字一个是字母，数字排在后面
+                return isNaN(a[key]) ? 1 : -1;
+              } else {
+                const nameA = a[key].toUpperCase(); // 转换为大写以便统一处理数字和字母
+                const nameB = b[key].toUpperCase();
+                // 都是字母，按字母排序
+                return nameA.localeCompare(nameB);
+              }
+            } else if (params[key] === "desc") {
+              if (!isNaN(a[key]) && !isNaN(b[key])) {
+                // 如果都是数字，按数字排序
+                return b[key] - a[key]
+              } else if (!isNaN(a[key]) || !isNaN(b[key])) {
+                // 如果一个是数字一个是字母，数字排在前面
+                return isNaN(a[key]) ? -1 : 1;
+              } else {
+                const nameA = a[key].toUpperCase(); // 转换为大写以便统一处理数字和字母
+                const nameB = b[key].toUpperCase();
+                // 都是字母，按字母排序
+                return nameB.localeCompare(nameA);
+              }
+            } else {
+              return 0;
+             }
+          }
+        }
+      });
+  },
 
 
     //  推送