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

src/api/document/cost-allocation-total.js

@@ -45,4 +45,6 @@ const seachPlanNum = params => getAction('/cost/syCostAllocation/queryByPlanNum'
 //保存 到单证汇总列表
 const addHalfInfo = params => postAction('/cost/syCostAllocation/add', params)
 
-export { costList, costByPlanNum, itemCheck, cancelItemCheck, seachPlanNum,addHalfInfo }
+const deleteFileDetail= params => deleteAction('/cost/syCostAllocation/deleteFile', params)
+
+export { costList, costByPlanNum, itemCheck, cancelItemCheck, seachPlanNum,addHalfInfo,deleteFileDetail }

src/api/document/fabricLossesSummary.js

@@ -10,6 +10,7 @@ const cancelSubmit = params => postAction('/orderData/syCostLossReview/cancelSub
 
 //审批历史
 const historyApproval  = params => getAction('/orderData/syCostLossReview/querySyApprovalHistory', params)
+const assignedData  = params => getAction('/orderData/syCostLossReview/querySyApprovalAssignedBy', params)
 
 
-export { checkList,cancelSubmit,historyApproval}
+export { checkList,cancelSubmit,historyApproval,assignedData}

src/views/book/addBookDrawer.vue

@@ -309,6 +309,7 @@
                      v-for="(item,index) in FreightOption"
                      :key="index"
                      @click="freightForwarderClick(item,record)"
+                     :title="item.cvenname"
                      :value="item.cvencode">
                      {{item.cvenname}}
                      </a-select-option>
@@ -364,6 +365,7 @@
                      v-for="(item,index) in FreightOption"
                      :key="index"
                      @click="freightForwarderClick(item,record)"
+                     :title="item.cvenname"
                      :value="item.cvencode">
                      {{item.cvenname}}
                      </a-select-option>
@@ -981,6 +983,7 @@ export default {
           newObj.isAhaa = country[1]
           newObj.rmbList = this.rmbList
           newObj.usdList = this.usdList
+          newObj.latestDateOfShipment =(newObj.latestDateOfShipment&&newObj.latestDateOfShipment!=='') ?moment(this.addBook.latestDateOfShipment).format('YYYY-MM-DD'):''
           newObj.syShippingOrderItemList = this.addBookData
             for(var i =0;i<newObj.syShippingOrderItemList.length;i++){
              var row = newObj.syShippingOrderItemList[i]

src/views/book/book-list.vue

@@ -125,6 +125,15 @@
           <a-tag color="orange" v-if="record.syStuta == '0'">未推送</a-tag>
           <a-tag color="green" v-if="record.syStuta == '1'">已推送</a-tag>
         </span>
+        <!-- 发票推送状态 -->
+        <span slot="timeStuta" slot-scope="text, record">
+          <a-tag color="#f50" v-if="record.timeStuta == '0'">可推送</a-tag>
+          <a-tag color="blue" v-if="record.timeStuta == '1'">推送中</a-tag>
+          <a-tag color="red" v-if="record.timeStuta == '2'">推送失败</a-tag>
+          <a-tag color="green" v-if="record.timeStuta == '3'">推送成功</a-tag>
+          <a-tag color="blue" v-if="record.timeStuta == '4'">不可推送</a-tag>
+        </span>
+        
         <!-- if  已提交 -->
         <!-- <span slot="documentStateSlot">
           <a-tag color="#2db7f5">已提交</a-tag>
@@ -284,6 +293,14 @@ export default {
           fixed: 'right',
           className: 'replacecolor'
         },
+        {
+          title: '发票推送状态',
+          dataIndex: 'timeStuta',
+          width: 120,
+          scopedSlots: { customRender: 'timeStuta' },
+          fixed: 'right',
+          className: 'replacecolor'
+        },
         {
           title: '操作',
           dataIndex: 'operation',
@@ -532,6 +549,7 @@ export default {
               this.$refs.detailsBookDrawer.addBookData = data.syShippingOrderItemList
               this.$refs.detailsBookDrawer.rmbList = data.rmbList
               this.$refs.detailsBookDrawer.usdList = data.usdList
+              this.$refs.detailsBookDrawer.timeMesage = (data.timeMesage!=='' && data.timeMesage) ? (data.timeMesage.split(";")) :[]
               if(data.syStuta == 0){
                 this.$refs.detailsBookDrawer.disabled = false
               }

src/views/book/detailsBookDrawer.vue

@@ -245,6 +245,20 @@
               </a-table>
             </div>
           </a-row>
+          <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-model-item label="推送成功单据"  prop="accessory">
+              <ul v-for="(item, index) in timeMesage" :key="index" >
+                <li>{{ item }} </li>
+              </ul>
+            </a-form-model-item>
+        </a-col>
+        <a-col :span="12">
+            <a-form-model-item label="失败信息"  prop="accessory">
+              <span>{{ addBook.failMesage }}</span>
+            </a-form-model-item>
+        </a-col>
+        </a-row>
         </a-spin>
       </a-card>
 
@@ -284,6 +298,7 @@ export default {
     let ellipsis = (v, l = 15) => <j-ellipsis value={v} length={l} />
     return {
       disabled:true,
+      timeMesage:[],
       // 表头
       addBookColumns: [
         {

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

@@ -69,6 +69,18 @@
                 <a-input placeholder="请输入" v-model="queryParam.cPersonName"></a-input>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="8">
+            <a-form-item label="状态">
+                <a-select v-model="queryParam.status">
+                    <a-select-option value="">请选择</a-select-option>
+                    <a-select-option value="保存">保存</a-select-option>
+                    <a-select-option value="提交">提交</a-select-option>
+                    <a-select-option value="已指派">已指派</a-select-option>
+                    <a-select-option value="返单">返单</a-select-option>
+                    <a-select-option value="完成">完成</a-select-option>
+                  </a-select>
+              </a-form-item>
+            </a-col>
             
             </template>
 
@@ -100,10 +112,10 @@
         @change="handleTableChange"
       >
       <span slot="action" slot-scope="text, record">
-          <a @click="handleApply(record)" v-if="apply == 1 && (record.status=='保存' ||record.status=='完成'|| record.status=='' || record.status==undefined)">发起申请</a>
-          <a-divider type="vertical"  v-if="apply == 1 && (record.status=='保存' ||record.status=='完成'|| record.status=='' || record.status==undefined)"/>
+          <!-- <a @click="handleApply(record)" v-if="apply == 1 && (record.status=='保存' ||record.status=='完成'|| record.status=='' || record.status==undefined)">发起申请</a>
+          <a-divider type="vertical"  v-if="apply == 1 && (record.status=='保存' ||record.status=='完成'|| record.status=='' || record.status==undefined)"/> -->
           <a @click="openAppendixList(record)" v-if="record.attachs!==''&&record.attachs">附件</a>
-          <!-- <a-divider v-if="record.attachs!==''&&record.attachs"/>
+          <a-divider type="vertical"  v-if="record.attachs!==''&&record.attachs"/>
           <a-dropdown>
           <a class="ant-dropdown-link">更多<a-icon type="down"/></a>
             <a-menu slot="overlay" >
@@ -111,7 +123,7 @@
               <a-menu-item><a @click="details(record)">详情</a></a-menu-item>
               <a-menu-item><a @click="approvalHistory(record)">审批历史</a></a-menu-item>
             </a-menu>
-            </a-dropdown>                   -->
+            </a-dropdown>                  
         </span>
       </a-table>
     </a-card>
@@ -179,6 +191,21 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
+        {
+          title: '返单日期',
+          width: 120,
+          dataIndex: 'rejectDate',
+          customRender: text => {
+            if(text!==''&&text){
+              return moment(text).format('YYYY-MM-DD')
+            }else{
+              return ''
+            }
+            
+          },
+          ellipsis: true,
+          className: 'replacecolor'
+        },
         {
           title: '计划单号',
           width: 120,
@@ -317,13 +344,15 @@ export default {
       this.queryParam.pageNo = pagination.current
       this.getCostList()
     },
-    changeCreateTime(){
-       this.queryParam.createTimeE=this.createTime[1].format('YYYY-MM-DD')
-       this.queryParam.createTimeB=this.createTime[0].format('YYYY-MM-DD')
+    changeCreateTime(data){
+      this.createTime=data
+       this.queryParam.createTimeE=this.createTime.length==2?this.createTime[1].format('YYYY-MM-DD'):''
+       this.queryParam.createTimeB=this.createTime.length==2?this.createTime[0].format('YYYY-MM-DD'):''
     },
-    changeApprovalDate(){
-      this.queryParam.approvalDateE=this.approvalDate[0].format('YYYY-MM-DD')
-       this.queryParam.approvalDateB=this.approvalDate[1].format('YYYY-MM-DD')
+    changeApprovalDate(data){
+      this.approvalDate = data
+      this.queryParam.approvalDateB=this.approvalDate.length==2?this.approvalDate[0].format('YYYY-MM-DD'):''
+       this.queryParam.approvalDateE=this.approvalDate.length==2?this.approvalDate[1].format('YYYY-MM-DD'):''
     },
     handleApply(record){
       var data = {

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 【单证】 财务核对表 -->
+  <!-- 【单证】 计划单统计表 -->
   <div id="costAllocationTotal">
     <!-- 查询区域 -->
     <a-card :bordered="false">
@@ -30,6 +30,15 @@
             </a-col>
 
             <template v-if="toggleSearchStatus">
+              <!-- <a-col :md="6" :sm="8">
+              <a-form-item label="是否存在对单人">
+                <a-select v-model="queryParam.isPlanMan"  placeholder="" >
+                 <a-select-option value="">请选择</a-select-option>
+                 <a-select-option value="是">是</a-select-option>
+                 <a-select-option value="否">否</a-select-option>
+               </a-select>
+              </a-form-item>
+            </a-col> -->
               <a-col :md="6" :sm="8">
               <a-form-item label="面损表单据状态">
                 <a-select v-model="queryParam.fstatus">
@@ -39,6 +48,7 @@
                     <a-select-option value="返单">返单</a-select-option>
                     <a-select-option value="完成">完成</a-select-option>
                     <a-select-option value="初审通过">初审通过</a-select-option>
+                    <a-select-option value="已指派">已指派</a-select-option>
                   </a-select>
                 <!-- <a-input placeholder="请输入面损表单据状态" v-model="queryParam.fstatus"></a-input> -->
               </a-form-item>
@@ -81,7 +91,7 @@
                 <a-range-picker
                   :placeholder="['开始时间', '结束时间']"
                   format="YYYY-MM-DD"
-                  style="width: 100%"
+                   
                   v-model="ffirstApproveDate"
                   @change="changeFfirstApproveDate"
                 />
@@ -175,10 +185,35 @@ export default {
       costAllocationColumns: [
         { title: '计划单号', width: 120, dataIndex: 'planNo', fixed: 'left', className: 'replacecolor' },
         { title: '日期', width: 120, dataIndex: 'dverifyDate', className: 'replacecolor' },
-        { title: '部门', width: 120, dataIndex: 'department', className: 'replacecolor'},
+        { title: '部门', width: 120, dataIndex: 'department', className: 'replacecolor',
+        sorter:(a,b)=> {
+                  let temp1="";
+                  let temp2="";
+                  if(a.department!=null){
+                    temp1=a.department;
+                  }
+                  if(b.department!=null){
+                    temp2=b.department;
+                  }
+                  return temp1.localeCompare(temp2);
+              },
+      },
         { title: '业务员', width: 120, dataIndex: 'salesman', className: 'replacecolor' },
         { title: '计划师傅/制单人', width: 150, dataIndex: 'maker', className: 'replacecolor'},
-        { title: '对单人(手输人)', width: 220, dataIndex: 'planMan', align: 'left', className: 'replacecolor', scopedSlots: { customRender: 'planMan' }, },
+        { title: '对单人(手输人)', width: 220, dataIndex: 'planMan', align: 'left', className: 'replacecolor',
+        scopedSlots: { customRender: 'planMan' },
+        sorter:(a,b)=> {
+                  let temp1="";
+                  let temp2="";
+                  if(a.planMan!=null){
+                    temp1=a.planMan;
+                  }
+                  if(b.planMan!=null){
+                    temp2=b.planMan;
+                  }
+                  return temp1.localeCompare(temp2);
+              },
+         },
         //  {
         //   title: '创建时间',
         //   dataIndex: 'createTime',
@@ -200,7 +235,10 @@ export default {
             }
             
           },
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.fsubmitDate) > new Date(b.fsubmitDate) ? 1 : -1;
+          },
         },
         {
           title: '返单日期',
@@ -214,7 +252,10 @@ export default {
             }
             
           },
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.frejectDate) > new Date(b.frejectDate) ? 1 : -1;
+          },
         },
         {
           title: '审核结束日期',
@@ -228,7 +269,10 @@ export default {
             }
             
           },
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.ffirstApproveDate) > new Date(b.ffirstApproveDate) ? 1 : -1;
+          },
         },
         {
           title: '核纱结束日期',
@@ -243,9 +287,24 @@ export default {
           //   }
             
           // },
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.ffinalApproveDate) > new Date(b.ffinalApproveDate) ? 1 : -1;
+          },
         },
-        { title: '面损表单据状态', width: 90, dataIndex: 'fstatus', className: 'replacecolor' },
+        { title: '面损表单据状态', width: 90, dataIndex: 'fstatus', className: 'replacecolor',
+        sorter:(a,b)=> {
+                  let temp1="";
+                  let temp2="";
+                  if(a.fstatus!=null){
+                    temp1=a.fstatus;
+                  }
+                  if(b.fstatus!=null){
+                    temp2=b.fstatus;
+                  }
+                  return temp1.localeCompare(temp2);
+              },
+         },
         {
           title: '交单日期',
           width: 120,
@@ -258,7 +317,10 @@ export default {
             }
             
           },
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.csubmitDate) > new Date(b.csubmitDate) ? 1 : -1;
+          },
         },
         {
           title: '返单日期',
@@ -272,7 +334,10 @@ export default {
             }
             
           },
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.crejectDate) > new Date(b.crejectDate) ? 1 : -1;
+          },
         },
         {
           title: '结束日期',
@@ -286,9 +351,24 @@ export default {
             }
             
           },
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter: (a, b) => {
+            return new Date(a.cfirstApproveDate) > new Date(b.cfirstApproveDate) ? 1 : -1;
+          },
         },
-        { title: '分配表单据状态', width: 120, dataIndex: 'cstatus', className: 'replacecolor' },
+        { title: '分配表单据状态', width: 120, dataIndex: 'cstatus', className: 'replacecolor',
+        sorter:(a,b)=> {
+                  let temp1="";
+                  let temp2="";
+                  if(a.cstatus!=null){
+                    temp1=a.cstatus;
+                  }
+                  if(b.cstatus!=null){
+                    temp2=b.cstatus;
+                  }
+                  return temp1.localeCompare(temp2);
+              },
+       },
         {
           title: '备注',
           width: 180,
@@ -312,10 +392,14 @@ export default {
         // index: '',
         // planNum: '',
         // customerShortame: '',
+        pageSize:100,
         pageNo: '' // 点击的页数
       },
       // 分页
       pagination: {
+        pageSizeOptions: ["100","150", "500"],
+        showSizeChanger: true,
+        pageSize:100
       },
       dateFormat: 'YYYY-MM-DD',
       loading: false // 表格加载
@@ -341,7 +425,9 @@ export default {
             this.pagination = {
               total: res.result.total,
               current: res.result.current,
-              pageSize: res.result.size
+              pageSize: res.result.size,
+              pageSizeOptions: ["100","150", "500"],
+              showSizeChanger: true,
             }
           }else{
             this.$message.error(res.message);
@@ -423,6 +509,7 @@ export default {
 
     handleTableChange(pagination, filters, sorter) {
       this.queryParam.pageNo = pagination.current
+      this.queryParam.pageSize = pagination.pageSize
       this.getCostList()
     },
   },

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

@@ -157,7 +157,7 @@
         selectedRowKeys: [],
         selectedRows: [],
         url: {
-          list: '/sys/user/list'
+          list: '/sys/user/userRoleList'
         }
       }
     },
@@ -177,13 +177,18 @@
         this.selectedRowKeys=[]
       },
       handleOk() {
-        this.dataSource2 = this.selectionRows
+        if(this.selectedRowKeys.length>1){
+          this.$message.error('只能勾选一条数据');
+        }else{
+          this.dataSource2 = this.selectionRows
         var name = []
         this.selectionRows.map(item=>name.push(item.realname))
         this.$emit('selectFinished', name.toString())
         this.visible = false
         this.selectedRowKeys = []
         this.selectionRows = []
+        }
+        
       },
       add() {
         this.visible = true
@@ -194,6 +199,7 @@
           this.ipagination.current = 1
         }
         var params = this.getQueryParams()// 查询条件
+        params.roleId = '1613346599648210946'
         getAction(this.url.list, params).then((res) => {
           if (res.success) {
             this.dataSource1 = res.result.records

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

@@ -11,16 +11,16 @@
         <a-button @click="Submit" :disabled="!(status=='保存'||status=='返单')">
           提交
         </a-button>
-        <a-button @click="assign" :disabled="!(status=='提交')">
+        <a-button @click="assign" :disabled="!(status=='提交')"   v-if="AssignedPerson=='no'&& authority=='yes'">
          指派
         </a-button>
-        <a-button @click="Approved" :disabled="!(status=='已指派')">
+        <a-button @click="Approved" :disabled="!(status=='已指派')" v-if="AssignedPersonQx=='yes'">
          审批通过
         </a-button>
-        <a-button @click="reject" :disabled="!(status=='已指派')">
+        <a-button @click="reject" :disabled="!(status=='已指派')" v-if="AssignedPersonQx=='yes'">
          驳回
         </a-button>
-        <a-button @click="revokeApproval" :disabled="!(status=='完成')">
+        <a-button @click="revokeApproval" :disabled="!(status=='完成')" v-if="AssignedPersonQx=='yes'">
          撤销审批
         </a-button>
         <a-button  @click="handlecLose">
@@ -79,6 +79,7 @@
 
             <a-col :md="6" :sm="8">
               <a-form-model-item label="实际出库数量">
+                {{ fabricLoss.outboundNumber }}
               </a-form-model-item>
             </a-col>
 
@@ -136,6 +137,16 @@
           :pagination="false"
           :rowClassName="setRowClassName"
         >
+        <!-- 采购数量 弹框-->
+        <span slot="purchaseQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+
+          <!-- 余纱 -->
+          <span slot="surplusYarn" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+
         
         </a-table>
       </div>
@@ -153,6 +164,20 @@
           :pagination="false" 
            :scroll="{ x: 1500 }"
           :loading="loading">
+          <!-- 材料出库数量 -->
+          <span slot="materialsOutQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+
+          <!-- 采购入库数量 -->
+          <span slot="purchaseInQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+           
+           <!-- 多发少发 -->
+           <span slot="iquantityMoreLess" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
           <!-- 附件 -->
           <span slot="enclosure" slot-scope="text, record"> 
              <a-button type="primary" @click="openItemOnclosure(record)" :disabled="record.buttonStatus">附件</a-button>
@@ -172,6 +197,20 @@
           bordered
           :pagination="false"
         >
+        <!-- 材料出库数量 -->
+        <span slot="materialsOutQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+
+          <!-- 采购入库数量 -->
+          <span slot="purchaseInQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+          
+          <!-- 多发少发 -->
+          <span slot="iquantityMoreLess" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
          <!-- 附件 -->
          <span slot="enclosure" slot-scope="text, record"> 
              <a-button type="primary" @click="openItemOnclosure(record)" :disabled="record.buttonStatus">附件</a-button>
@@ -190,6 +229,13 @@
           bordered
           :pagination="false"
         >
+         <!-- 成本金额 -->
+         <span slot="imoney" slot-scope="text,record">
+              <a v-if="((record.cbusType == '转出成本') || (record.cbusType == '转入成本'))&& !record.bmanual" @click="imoneyCell(record)">{{text}}</a>
+              <span v-if="(record.cbusType !== '转出成本') && (record.cbusType !== '转入成本') && !record.bmanual" >{{text}}</span>
+              <!-- <a-input placeholder="请输入" v-model="record.imoney" v-if="record.bmanual && showSelect==0" @blur="judageNumber(record,'imoney')"/> -->
+              <span v-if="record.bmanual" >{{text}}</span>
+          </span>
         </a-table>
       </div>
 
@@ -205,6 +251,11 @@
           bordered
           :pagination="false"
         >
+        <!-- 发票号码明细  -->
+        <span slot="invoiceNum" slot-scope="text">
+            <a v-if="text!=='合计'">{{ text }}</a>
+            <span v-else>{{text}}</span>
+          </span>
         </a-table>
       </div>
 
@@ -237,6 +288,10 @@
           bordered
           :pagination="false"
         >
+       <!-- 发票数量 -->
+       <span slot="ingredientsInvoiceQuantity" slot-scope="text, record">
+            <a v-if="record.caccount!=='合计'">{{ text }}</a>
+          </span>
         </a-table>
       </div>
 
@@ -321,6 +376,36 @@
       </a-row>
     </a-card>
   </div>
+  <!-- 采购数量弹框  @ok="modalFormOk"-->
+  <purchaseAmount-modal ref="purchaseAmountModal" :father="aa"></purchaseAmount-modal>
+
+<!-- 来源余纱 -->
+<surplusYarn-modal ref="surplusYarnModal" :father="bb"></surplusYarn-modal>
+
+<!-- 余纱 -->
+<purchaseLeft-modal ref="purchaseLeftModal"></purchaseLeft-modal>
+
+<!-- 其他入库的纱 -->
+<otherYarnsIn-modal ref="otherYarnsInModal" ></otherYarnsIn-modal>
+
+<!-- 多发少发 -->
+<iquantityMoreLess-modal ref="iquantityMoreLessModal"></iquantityMoreLess-modal>
+
+<!-- 委外订单国内弹框 -->
+<materialsOutQuantity-modal ref="materialsOutQuantityModal" :father="cc" @Bulk-price="bulkPrice"></materialsOutQuantity-modal>
+
+<!-- 采购入库数量弹框 -->
+<purchaseInQuantity-modal ref="purchaseInQuantityModal" :father="dd"></purchaseInQuantity-modal>
+
+<!-- 发票号码弹框 -->
+<invoiceNum-modal ref="invoiceNumModal" :father="ee"></invoiceNum-modal>
+
+<!-- 发票数量弹框 -->
+<invoiceQuantity-modal ref="invoiceQuantityModal" :father="ff"></invoiceQuantity-modal>
+
+<!-- 事故单 -->
+<accidentList-modal ref="accidentListModal" :father="gg"></accidentList-modal>
+<imoney-cell ref="imoneyCell"></imoney-cell>
    <!-- 附件 -->
    <attachment-display ref="attachmentDisplay"></attachment-display>
    <!-- 提交信息 -->
@@ -332,17 +417,17 @@
 </template>
 
 <script>
-// import PurchaseAmountModal from '@views/reportForms/fabric-loss-table/purchaseAmountModal.vue'
-// import materialsOutQuantityModal from '@views/reportForms/fabric-loss-table/materialsOutQuantityModal.vue'
-// import purchaseInQuantityModal from '@views/reportForms/fabric-loss-table/purchaseInQuantityModal.vue'
-// import invoiceNumModal from '@views/reportForms/fabric-loss-table/invoiceNumModal.vue'
-// import invoiceQuantityModal from '@views/reportForms/fabric-loss-table/invoiceQuantityModal.vue'
-// import accidentListModal from '@views/reportForms/fabric-loss-table/accidentListModal.vue'
-// import surplusYarnModal from '@views/reportForms/fabric-loss-table/surplusYarnModal.vue'
-// import purchaseLeftModal from '@views/reportForms/fabric-loss-table/purchaseLeftModal.vue'
-// import imoneyCell from '@views/reportForms/fabric-loss-table/imoneyCell.vue'
-// import iquantityMoreLessModal from '@views/reportForms/fabric-loss-table/iquantityMoreLessModal.vue'
-// import otherYarnsInModal from '@views/reportForms/fabric-loss-table/otherYarnsInModal.vue'
+import PurchaseAmountModal from '@views/reportForms/fabric-loss-table/purchaseAmountModal.vue'
+import materialsOutQuantityModal from '@views/reportForms/fabric-loss-table/materialsOutQuantityModal.vue'
+import purchaseInQuantityModal from '@views/reportForms/fabric-loss-table/purchaseInQuantityModal.vue'
+import invoiceNumModal from '@views/reportForms/fabric-loss-table/invoiceNumModal.vue'
+import invoiceQuantityModal from '@views/reportForms/fabric-loss-table/invoiceQuantityModal.vue'
+import accidentListModal from '@views/reportForms/fabric-loss-table/accidentListModal.vue'
+import surplusYarnModal from '@views/reportForms/fabric-loss-table/surplusYarnModal.vue'
+import purchaseLeftModal from '@views/reportForms/fabric-loss-table/purchaseLeftModal.vue'
+import imoneyCell from '@views/reportForms/fabric-loss-table/imoneyCell.vue'
+import iquantityMoreLessModal from '@views/reportForms/fabric-loss-table/iquantityMoreLessModal.vue'
+import otherYarnsInModal from '@views/reportForms/fabric-loss-table/otherYarnsInModal.vue'
 import AttachmentDisplay from '@views/reportForms/fabric-loss-table/attachment-display.vue'
 import submitInformation from '@views/cost-allocation-total/modal/submitInformation.vue'
 import SelectUserModal from '@views/cost-allocation-total/modal/SelectUserModal.vue'
@@ -352,23 +437,25 @@ import JEllipsis from '@/components/jeecg/JEllipsis'
 import JUpload from '@/components/jeecg/JUpload'
 import moment from 'moment'
 import { runInThisContext } from 'vm'
-import {cancelSubmit } from '@api/document/fabricLossesSummary.js'
+import {cancelSubmit,assignedData } from '@api/document/fabricLossesSummary.js'
+import { USER_AUTH } from "@/store/mutation-types"
 
 export default {
   name: 'FabricLossTable', // 面料损耗表
   mixins: [JeecgListMixin],
   components: {
     // 面料损耗表 所有弹框
-    // PurchaseAmountModal,
-    // otherYarnsInModal,
-    // materialsOutQuantityModal,
-    // purchaseInQuantityModal,
-    // invoiceNumModal,
-    // invoiceQuantityModal,
-    // iquantityMoreLessModal,
-    // accidentListModal,
-    // surplusYarnModal,
-    // purchaseLeftModal,
+    PurchaseAmountModal,
+    otherYarnsInModal,
+    materialsOutQuantityModal,
+    purchaseInQuantityModal,
+    invoiceNumModal,
+    invoiceQuantityModal,
+    iquantityMoreLessModal,
+    accidentListModal,
+    surplusYarnModal,
+    purchaseLeftModal,
+    imoneyCell,
     JEllipsis,
     moment,
     JUpload,
@@ -439,6 +526,8 @@ export default {
           dataIndex: 'iquantityIn',
           width: '6%',
           className: 'replacecolor',
+          customCell: this.purchaseQuantityCustomCell,
+          scopedSlots: { customRender: 'purchaseQuantity' }
         },
 
         { title: '采购供应商', dataIndex: 'cvenAbbName', width: '7%', className: 'replacecolor' },
@@ -449,6 +538,8 @@ export default {
           dataIndex: 'iquantityLeft',
           width:'5%',
           className: 'replacecolor',
+          customCell: this.surplusYarnCustomCell,
+          scopedSlots: { customRender: 'surplusYarn' }
         },
         { title: '采购损耗', dataIndex: 'iquantityLeftRate', width: '6%', className: 'replacecolor' }
       ],
@@ -462,6 +553,8 @@ export default {
           dataIndex: 'iquantityOut',
           width: '5%',
           className: 'replacecolor',
+          customCell: this.materialsOutQuantityCustomCell,
+          scopedSlots: { customRender: 'materialsOutQuantity' }
         },
         { title: '计划数量', dataIndex: 'iquantity', width: '6%', className: 'replacecolor' },
 
@@ -496,7 +589,7 @@ export default {
         { title: '货物名称', dataIndex: 'cinvName', width: '20%',className: 'replacecolor specel-width' },
         { title: '颜色', dataIndex: 'ccolor', width: '7%', className: 'replacecolor' },
         { title: '损耗', dataIndex: 'cquantityLoss',  width: '6%',className: 'replacecolor' },
-         { title: '多发少发', dataIndex: 'iquantityMoreLess', width: '6%', className: 'replacecolor',},
+         { title: '多发少发', dataIndex: 'iquantityMoreLess', width: '6%', className: 'replacecolor', scopedSlots: { customRender: 'iquantityMoreLess' }, customCell: this.iquantityMoreLessCell,},
          { title: '附件', dataIndex: 'enclosure', width: '6%', className: 'noprint', scopedSlots: { customRender: 'enclosure' }}
       ],
 
@@ -505,8 +598,8 @@ export default {
         { title: '类型', width: 120, dataIndex: 'cvcname', className: 'replacecolor' },
         { title: '采购类型', width: 120, dataIndex: 'cbusType', className: 'replacecolor' },
         { title: '工厂', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor'},
-        { title: '成本金额', dataIndex: 'imoney', width: 120, className: 'replacecolor'},
-        { title: '无税金额', dataIndex: 'inoTaxMoney', width: 120, className: 'replacecolor' }
+        { title: '成本金额', dataIndex: 'imoney', width: 120, className: 'replacecolor',scopedSlots: { customRender: 'imoney' }},
+        // { title: '无税金额', dataIndex: 'inoTaxMoney', width: 120, className: 'replacecolor' }
       ],
       costInvoiceData: [
         { costInvoiceType: '纱款', factory: '17TW-C-17B', costAmount: '5081.72' },
@@ -553,6 +646,8 @@ export default {
 
           width: 120,
           className: 'replacecolor',
+          customCell: this.clInvoiceQuantityCustomCell,
+          scopedSlots: { customRender: 'clInvoiceQuantity' }
         }
       ],
       // 开票成本-成衣 表头
@@ -570,6 +665,8 @@ export default {
 
           width: 120,
           className: 'replacecolor',
+          customCell: this.clInvoiceQuantityCustomCell,
+          scopedSlots: { customRender: 'clInvoiceQuantity' }
         }
       ],
 
@@ -606,6 +703,8 @@ export default {
           width: '10%',
           dataIndex: 'iquantityInvoice',
           className: 'replacecolor',
+          customCell: this.ingredientsInvoiceQuantityCustomCell,
+          scopedSlots: { customRender: 'ingredientsInvoiceQuantity' }
         },
         { title: '开票金额(人民币)', width: '10%', dataIndex: 'isum', className: 'replacecolor' },
         { title: '开票金额(美元)', width: '10%', dataIndex: 'ioriSum', className: 'replacecolor',customRender: (text, record, index) => {
@@ -667,7 +766,10 @@ export default {
       noteTwo: '', // 备注 2
       dd:0,
       status:'',
-      detailModVis:false 
+      detailModVis:false ,
+      AssignedPerson:'no',
+      AssignedPersonQx:'no',
+      authority:'no'
     }
   },
   methods: {
@@ -828,6 +930,7 @@ export default {
               this.fabricLoss = {fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[],fabricCostAssistList:[],fabricCostClothList:[],fabricCostClothesList:[],fabricCostInvoiceList:[],fabricExpensesList:[],fabricAccidentList:[]};
               this.$message.info(res.message);
             }
+            this.determineAssignedPerson()
           })
         })
       }
@@ -951,6 +1054,32 @@ export default {
       this.$refs.submitInformation.text = '提交'
 
     },
+    //判断有无指派人
+    determineAssignedPerson(){
+      assignedData({code:this.planNO}).then(res => {
+          if (res.success) {
+            var array = res.result!==''?res.result.split(","):[]
+            if(array.length!==0){
+              this.AssignedPerson='yes'
+            }
+          let allAuthes = JSON.parse(sessionStorage.getItem(USER_AUTH));
+           var quanXian = []
+           allAuthes.map(item=>{ quanXian.push(item.action)})
+           if(quanXian.indexOf('zpqx:kj')!==-1){
+            this.authority = 'yes'
+           }
+            array.every(item=>{
+              if(item==this.$store.getters.userInfo.realname){
+                this.AssignedPersonQx='yes'
+                return false
+              }
+              return true
+            })
+          }else{
+            this.$message.error(res.message);
+          }
+        })
+    },
     assign(){
       this.$refs.SelectUserModal.visible = true
     },
@@ -991,6 +1120,7 @@ export default {
             this.$message.success('指派成功')
             this.handlecLose()
             this.$emit('close')
+            this.determineAssignedPerson()
           }else{
             this.$message.error(res.message);
           }
@@ -1033,11 +1163,133 @@ export default {
             this.$message.success('撤销审批成功')
             this.handlecLose()
             this.$emit('close')
+            this.AssignedPerson='yes'
           }else{
             this.$message.error(res.message);
           }
         })
     },
+     // 【采购数量】单元格 弹框
+     purchaseQuantityCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+
+            if (record.cpoid == '来源余料') {
+              this.$refs.surplusYarnModal.surplusYarnData = record.fabricPoOrderOutList;
+              this.$refs.surplusYarnModal.allDataList = record.fabricPoOrderOutList;
+              this.$refs.surplusYarnModal.surplusYarnModVis = true
+            }else if (record.cpoid == '其他入库') {
+              this.$refs.otherYarnsInModal.otherYarnsInData = record.fabricPoOrderOutList;
+              this.$refs.otherYarnsInModal.allDataList = record.fabricPoOrderOutList;
+              this.$refs.otherYarnsInModal.otherYarnsInModVis = true
+            } else {
+              this.$refs.purchaseAmountModal.purchaseAmountData = record.fabricPoOrderInList;              
+              this.$refs.purchaseAmountModal.allDataList = record.fabricPoOrderInList;
+              this.$refs.purchaseAmountModal.purchaseAmountModVis = true
+            }
+          }
+        }
+      }
+    },
+    // 余纱
+    surplusYarnCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            this.$refs.purchaseLeftModal.surplusYarnData = record.fabricPoOrderOutList;
+            this.$refs.purchaseLeftModal.allDataList = record.fabricPoOrderOutList;
+            this.$refs.purchaseLeftModal.surplusYarnModVis = true
+          }
+        }
+      }
+    },
+    // 【材料出库数量】 弹框
+    materialsOutQuantityCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            this.$refs.materialsOutQuantityModal.materialsOutQuantityData = record.fabricMoOrderCKList;
+            this.$refs.materialsOutQuantityModal.allDataList = record.fabricMoOrderCKList;
+            this.$refs.materialsOutQuantityModal.queryParam = {};
+            this.$refs.materialsOutQuantityModal.materialsOutQuantityModVis = true
+            this.$refs.materialsOutQuantityModal.type = '1'
+          }
+        }
+      }
+    },
+     // 采购入库数量
+     purchaseInQuantityCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            this.$refs.purchaseInQuantityModal.purchaseInQuantityData = record.fabricMoOrderRKList;
+            this.$refs.purchaseInQuantityModal.allDataList = record.fabricMoOrderRKList;
+            this.$refs.purchaseInQuantityModal.queryParam = {};
+            this.$refs.purchaseInQuantityModal.purchaseInQuantityModVis = true
+          }
+        }
+      }
+    },
+    iquantityMoreLessCell(record){
+      return {
+        on: {
+          click: event => {
+            this.$refs.iquantityMoreLessModal.surplusYarnData = record.fabricPoOrderOutList;
+            this.$refs.iquantityMoreLessModal.allDataList = record.fabricPoOrderOutList;
+            this.$refs.iquantityMoreLessModal.surplusYarnModVis = true
+          }
+        }
+      }
+    },
+    // 开票成本-面料弹框
+    invoiceNumCustomCell(record) {
+      if(record.csbvcode!=='合计'){
+        return {
+        on: {
+          click: event => {
+            this.$refs.invoiceNumModal.invoiceNumData = record.fabricCostClothDetailList;
+            this.$refs.invoiceNumModal.allDataList = record.fabricCostClothDetailList;
+            this.$refs.invoiceNumModal.queryParam = {};
+            this.$refs.invoiceNumModal.invoiceNumModVis = true;
+          }
+        }
+      }
+      }
+    },
+    // 开票成本成衣-弹框
+    clInvoiceQuantityCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            this.$refs.invoiceQuantityModal.invoiceQuantityData = record.fabricCostClothesDetailList;
+            this.$refs.invoiceQuantityModal.allDataList = record.fabricCostClothesDetailList;
+            this.$refs.invoiceQuantityModal.invoiceQuantityModVis = true;
+          }
+        }
+      }
+    },
+    // 开票成本辅料-弹框
+    ingredientsInvoiceQuantityCustomCell(record) {
+      if(record.caccount!=='合计'){
+        return {
+        on: {
+          click: event => {
+            this.$refs.invoiceQuantityModal.invoiceQuantityData = record.fabricCostAssistDetailList;
+            this.$refs.invoiceQuantityModal.allDataList = record.fabricCostAssistDetailList;
+            this.$refs.invoiceQuantityModal.queryParam = {};
+            this.$refs.invoiceQuantityModal.invoiceQuantityModVis = true
+          }
+        }
+      }
+      }
+    },
+    //成本金额弹窗
+    imoneyCell(record){
+            this.$refs.imoneyCell.imoneyModVis = true
+            this.$refs.imoneyCell.imoneyData = record.costInvoiceDetailList
+           
+    },
 
   
     // father
@@ -1060,6 +1312,10 @@ export default {
   height: 571px;
     overflow-y: scroll;
 }
+/deep/ .ant-table.ant-table-bordered .ant-table-footer {
+  border: none;
+  padding: 0;
+}
 
 
 </style>

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

@@ -40,10 +40,11 @@
         ok(){
           this.$emit('close',this.value,this.text)
           this.close()
+          this.value = ''
         },
         close(){
             this.submitInformationModVis = false
-            this.value = ''
+            // this.value = ''
         }
    },
   }

src/views/order/manualModal.vue

@@ -164,7 +164,7 @@
         },
         {
           title: '颜色',
-          width: 80,
+          width: 100,
           dataIndex: 'colour',
           className: 'replacecolor',
           ellipsis: true
@@ -178,7 +178,7 @@
         },
         {
           title: '委外订单行号',
-          width: 90,
+          width: 120,
           dataIndex: 'ivouchRowNo',
           className: 'replacecolor',
           ellipsis: true
@@ -193,9 +193,10 @@
         },
         {
           title: '操作',
-          width: 120,
+          width: 170,
           dataIndex: 'operation',
           scopedSlots: { customRender: 'operationSlot' },
+          fixed: 'right',
           className: 'replacecolor',
           ellipsis: true
         },

src/views/packing-list/clothes-list.vue

@@ -55,11 +55,11 @@
                 </j-search-select-tag>
               </a-form-item>
             </a-col>
-              <!-- <a-col :md="6" :sm="8">
+              <a-col :md="6" :sm="8">
                 <a-form-item label="托书号">
                   <a-input placeholder="请输入托书号" v-model="queryParam.shippingOrderNumber"></a-input>
                 </a-form-item>
-              </a-col> -->
+              </a-col>
              <!-- <a-col :md="6" :sm="8">
               <a-form-item label="品名">
                 <a-input placeholder="请输入品名" v-model="queryParam.productName"></a-input>
@@ -210,6 +210,15 @@
           <!-- <a-tag color="#87d068" v-else>已提交</a-tag> -->
         </span>
 
+        <!-- 发票推送状态 -->
+        <span slot="timeStuta" slot-scope="text, record">
+          <a-tag color="#f50" v-if="record.timeStuta == '0'">可推送</a-tag>
+          <a-tag color="blue" v-if="record.timeStuta == '1'">推送中</a-tag>
+          <a-tag color="red" v-if="record.timeStuta == '2'">推送失败</a-tag>
+          <a-tag color="green" v-if="record.timeStuta == '3'">推送成功</a-tag>
+          <a-tag color="blue" v-if="record.timeStuta == '4'">不可推送</a-tag>
+        </span>
+
         <!-- 推送状态 -->
         <span slot="whetherCloudFactoryPush" slot-scope="text, record" :title ="record.cause">
            <span v-if="record.whetherCloudFactoryPush == '0'">否</span>
@@ -244,6 +253,7 @@
               </a-menu-item>
               <a-menu-item v-if="record.pushState!=='4'"><a @click="pushU8(record)">推送U8</a></a-menu-item>
               <a-menu-item v-if="record.pushState!=='4'"><a  @click="stopPush(record)">关闭推送</a></a-menu-item>
+              <a-menu-item v-if="record.pushState  =='4'"><a  @click="stopPush(record)">取消关闭推送</a></a-menu-item>
             </a-menu>
 
             <!-- 已提交 -->
@@ -253,6 +263,7 @@
               </a-menu-item>
               <a-menu-item v-if="record.pushState!=='4'"><a @click="pushU8(record)">推送U8</a></a-menu-item>
               <a-menu-item v-if="record.pushState!=='4'"><a @click="stopPush(record)">关闭推送</a></a-menu-item>
+              <a-menu-item v-if="record.pushState =='4'"><a @click="stopPush(record)">取消关闭推送</a></a-menu-item>
               <!-- <a-menu-item><a @click="itemXls(record)">导出</a></a-menu-item> -->
 
 
@@ -513,6 +524,7 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
+        
         {
           title: '单据号',
           dataIndex: 'documentNo',
@@ -520,6 +532,14 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
+        {
+          title: '发票推送状态',
+          dataIndex: 'timeStuta',
+          width: 120,
+          scopedSlots: { customRender: 'timeStuta' },
+          fixed: 'right',
+          className: 'replacecolor'
+        },
         {
           title: '推送状态',
           dataIndex: 'pushState',

src/views/packing-list/fabric-list.vue

@@ -156,6 +156,15 @@
           <a-tag color="#B7B7B7" v-if="record.pushState == '4'">不再推送</a-tag>
         </span>
 
+        <!-- 发票推送状态 -->
+        <span slot="timeStuta" slot-scope="text, record">
+          <a-tag color="#f50" v-if="record.timeStuta == '0'">可推送</a-tag>
+          <a-tag color="blue" v-if="record.timeStuta == '1'">推送中</a-tag>
+          <a-tag color="red" v-if="record.timeStuta == '2'">推送失败</a-tag>
+          <a-tag color="green" v-if="record.timeStuta == '3'">推送成功</a-tag>
+          <a-tag color="blue" v-if="record.timeStuta == '4'">不可推送</a-tag>
+        </span>
+
         <span slot="whetherCloudFactoryPush" slot-scope="text, record" :title ="record.cause">
            <span v-if="record.whetherCloudFactoryPush == '0'">否</span>
            <span v-if="record.whetherCloudFactoryPush == '1'">是</span>
@@ -180,6 +189,7 @@
               <a-menu-item><a @click="edit(record)">编辑</a></a-menu-item>
               <a-menu-item v-if="record.pushState!=='4'"><a @click="pushU8(record)">推送U8</a></a-menu-item>
               <a-menu-item v-if="record.pushState!=='4'"><a @click="stopPush(record)">关闭推送</a></a-menu-item>
+              <a-menu-item v-if="record.pushState =='4'"><a @click="stopPush(record)">取消关闭推送</a></a-menu-item>
               <!-- <a-menu-item><a @click="itemXls(record)">导出</a></a-menu-item> -->
               <!-- <a-menu-item><a @click="submit(record)">提交</a></a-menu-item> -->
               <a-menu-item>
@@ -193,6 +203,7 @@
               <a-menu-item><a @click="details(record)">详情</a></a-menu-item>
               <a-menu-item v-if="record.pushState!=='4'"><a @click="pushU8(record)">推送U8</a></a-menu-item>
               <a-menu-item v-if="record.pushState!=='4'"><a @click="stopPush(record)">关闭推送</a></a-menu-item>
+              <a-menu-item v-if="record.pushState =='4'"><a @click="stopPush(record)">取消关闭推送</a></a-menu-item>
               <!-- <a-menu-item><a @click="itemXls(record)">导出</a></a-menu-item> -->
               <!-- <a-menu-item><a @click="cancel(record)">取消提交</a></a-menu-item> -->
             </a-menu>
@@ -325,6 +336,14 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
+        {
+          title: '发票推送状态',
+          dataIndex: 'timeStuta',
+          width: 120,
+          scopedSlots: { customRender: 'timeStuta' },
+          fixed: 'right',
+          className: 'replacecolor'
+        },
         {
           title: '推送状态',
           dataIndex: 'pushState',

src/views/packing-list/packinglist-clothes/clothesAddDrawer.vue

@@ -36,7 +36,7 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="英文品名" prop="englishProductName">
-                  {{clothesAdd.englishProductName}}
+                  {{clothesAdd.englishProductName | ellipsis}}
                   <!-- <a-input placeholder="请输入英文品名" v-model="clothesAdd.englishProductName"></a-input> -->
                 </a-form-model-item>
               </a-col>
@@ -678,6 +678,16 @@ export default {
   },
   created() {},
   mounted() {},
+  filters: {
+                //文字数超出时，超出部分使用...
+                ellipsis(value) {
+                    if (!value) return ''
+                    if (value.length > 20) {
+                        return value.slice(0, 30) + '...'
+                    }
+                    return value
+                }
+            },
   methods: {
     // 参照回调
     referCallback(idArr){

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

@@ -177,11 +177,7 @@
                 {{detailsPlanNum.shuiemoney }}
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="8">
-              <a-form-model-item label="制单人" prop="maker">
-                {{ detailsPlanNum.preparedBy }}
-              </a-form-model-item>
-            </a-col>
+            
             <!-- <a-col :md="6" :sm="8">
               <a-form-model-item label="供应商事故单($)" prop="salesrrdersOriginaltotal">
                 {{ detailsPlanNum.supperAccidentUsdamount, }}
@@ -194,7 +190,8 @@
             </a-col> -->
             <a-col :md="6" :sm="8">
               <a-form-model-item label="税率%" prop="taxrate" > 
-                <a-input placeholder="请输入" v-model="detailsPlanNum.taxrate"  @blur="changeTaxrate" class="taxrate"/>
+                <a-input placeholder="请输入" v-model="detailsPlanNum.taxrate"  @blur="changeTaxrate" class="taxrate"  v-show='showSelect==0'/>
+                <span v-show='showSelect==1'>{{ detailsPlanNum.taxrate }}</span>
               </a-form-model-item>
             </a-col>
            
@@ -232,7 +229,38 @@
             </a-col> -->
             <a-col :md="6" :sm="8">
               <a-form-model-item label="备注" prop="UsdfabriccostNotincludestax" >
-                <a-input style="width:100%" type="text" v-model="detailsPlanNum.memo" @blur="changeContainerNumber" />
+                <a-input style="width:100%" type="text" v-model="detailsPlanNum.memo" @blur="changeContainerNumber" v-show='showSelect==0'/>
+                <span v-show='showSelect==1'>{{ detailsPlanNum.memo }}</span>
+              </a-form-model-item>
+            </a-col>
+            <!-- <a-col :md="6" :sm="8">
+              <a-form-model-item label="查询时间" prop="UsdfabriccostNotincludestax" >
+                {{  }}
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="查询人" prop="UsdfabriccostNotincludestax" >
+                {{  }}
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="" prop="UsdfabriccostNotincludestax" >
+                {{  }}
+              </a-form-model-item>
+            </a-col> -->
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="制单人" prop="maker">
+                {{ detailsPlanNum.preparedBy }}
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="查询人" prop="queryBy">
+                {{ detailsPlanNum.queryBy  }}
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="查询时间" prop="queryTime">
+                {{ detailsPlanNum.queryTime  }}
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="8" class="noprint">
@@ -259,7 +287,11 @@
               </h4>
               </a-form-model-item>
             </a-col>
-            
+            <a-col :md="6" :sm="8" class="noprint">
+              <a-upload  productName="file" :showUploadList="true" :file-list="fileList" :headers="tokenHeader" :multiple="false"   :action="importExcelUrl"  @change="handleImportExcel"  :data="{code:this.detailsPlanNum.planNum,name:this.fileName}"  :beforeUpload="uploadFlie" :remove="removeFile">
+                <a-button type="primary" >附件上传</a-button>
+              </a-upload>
+            </a-col>
         </a-form-model>
       </div>
       </a-row>
@@ -267,7 +299,7 @@
 
     <!--tabs 组件引入  -->
     <a-card :bordered="false" style=" marginTop:10px;">
-      <div><tabs ref="unitTabs" :showSelect='showSelect' /></div>
+      <div><tabs ref="unitTabs" :showSelect='showSelect'  @number="number" /></div>
     </a-card>
 
     <!-- 事故单 -->
@@ -359,7 +391,7 @@ import mainTableExpenseCNYModal from '@views/cost-allocation-total/modal/mainTab
 import mainTableExpenseUSDModal from '@views/cost-allocation-total/modal/mainTableExpenseUSDModal.vue'
 import accidentListModal from '@views/cost-allocation-total/modal/accidentListModal.vue' // 事故单
 
-import { seachPlanNum, addHalfInfo } from '@api/document/cost-allocation-total.js'
+import { seachPlanNum, addHalfInfo,deleteFileDetail } from '@api/document/cost-allocation-total.js'
 
 export default {
   name: 'CostAllocationTable', // 成本分配 (新增)
@@ -456,7 +488,7 @@ export default {
          },
         { 
           title: '人民币(价税合计)', 
-          dataIndex: 'totalTaxIncrease', 
+          dataIndex: 'iNatMoney', 
           width: 120, 
           className: 'replacecolor',
           customRender: (text, record, index) => {
@@ -473,6 +505,11 @@ export default {
       billstatus: '', // 单据状态
       color1:0,
       color2:0,
+      fileList:[],
+      url: {
+        list: '/sys/user/list',
+        importExcelUrl: 'cost/syCostAllocation/addFile' ,// 导入
+      }
       // dateFormat: 'YYYY-MM-DD',
     }
   },
@@ -498,6 +535,18 @@ export default {
             this.PrintButton = false
              this.loading = false
             this.detailsPlanNum = res.result //所有详情
+            var fileList =  (this.detailsPlanNum.attachs!==''&&this.detailsPlanNum.attachs)?this.detailsPlanNum.attachs.split(","):[]
+              this.fileList = []
+              if(fileList.length!==0){
+                fileList.map(item=>{
+                  this.fileList.push({
+                    uid: '-1',
+                    name: item,
+                    status: 'done',
+                    url:'http://www.myfitt.cn:18001/jeecg-boot/sys/common/static' +'/'+item
+                  })
+              })
+              }
             //调整表头格式
             this.adjustingHeader()
             this.accidentListData = res.result.syCostAllocationAccidentList //事故单
@@ -540,7 +589,8 @@ export default {
             })
             //  this.$refs.unitTabs.sumInfo.fabricAmount = s.toFixed(3) //合计中的面料总额
              this.$refs.unitTabs.sumInfo.fabricAmount = (this.detailsPlanNum.fabriccostIncludestax!==''&&this.detailsPlanNum.fabriccostIncludestax)?(Number(this.detailsPlanNum.fabriccostIncludestax)).toFixed(2):'' //合计中的面料总额
-             this.$refs.unitTabs.sumInfo.fabricExcludTax =(Number(this.$refs.unitTabs.sumInfo.fabricAmount)/(1+Number(this.detailsPlanNum.taxrate))).toFixed(2)//合计中的不含税面料总额
+             this.$refs.unitTabs.sumInfo.fabricExcludTax =(Number(this.$refs.unitTabs.sumInfo.fabricAmount)/(1+(Number(this.detailsPlanNum.taxrate)/100))).toFixed(2)//合计中的不含税面料总额
+             this.detailsPlanNum.fabriccostNotincludestax =  this.$refs.unitTabs.sumInfo.fabricExcludTax
              // this.detailsPlanNum.fabriccostIncludestax = s.toFixed(3) //表头中面料含税总额
             // this.detailsPlanNum.fabriccostNotincludestax = (s/1.13).toFixed(3) //表头中面料不含税总额
             //合计中辅料相关金额
@@ -548,10 +598,11 @@ export default {
             v =0
             oneData.syCostAllocationIngredientList.map(item=>{
               s+=Number(item.priceExcludingtax),
-              v+=Number(item.rmbAmount)
+              v+=item.rmbAmount?Number(item.rmbAmount):0
             })
             this.$refs.unitTabs.sumInfo.ingAmount =(v/2).toFixed(2)//辅料金额合计
-            this.$refs.unitTabs.sumInfo.ingExcludAmount = ((v/2).toFixed(2)/(1+Number(this.detailsPlanNum.taxrate))).toFixed(2)//辅料不含税金额合计
+            this.$refs.unitTabs.sumInfo.ingExcludAmount = ((v/2).toFixed(2)/(1+(Number(this.detailsPlanNum.taxrate)/100))).toFixed(2)//辅料不含税金额合计
+            this.detailsPlanNum.excipiencostNotincludestax =  this.$refs.unitTabs.sumInfo.ingExcludAmount
             //合计中出运明细相关金额
             var s =0,
             v = 0,
@@ -563,7 +614,7 @@ export default {
               s+=Number(item.exportPrice)
               v+=Number(item.shipQuantity)
               d+=Number(item.processCost)
-              b+=Number(item.exportPrice)
+              b+=Number(item.rmbAmount)
               if(item.exchangeRate=='6.888' && item.outdata!=='合计'){
                  e+=Number(item.processCost)
               }else if(item.outdata!=='合计'){
@@ -571,12 +622,14 @@ export default {
               }
             })
             this.$refs.unitTabs.sumInfo.exportPriceUSD = (s/2).toFixed(2)//出运美元外销总价
+            this.detailsPlanNum.usdTotalexportprice = this.$refs.unitTabs.sumInfo.exportPriceUSD //表头-外销总价（$)
             this.$refs.unitTabs.sumInfo.shipQua =(v/2).toFixed(4)//出货数量合计
             this.$refs.unitTabs.sumInfo.shipProcesFees =(d/2).toFixed(2)//出运加工费
             this.$refs.unitTabs.sumInfo.exportedAmountRMB =(b/2).toFixed(2)//出运人民币外销金额 f
+            this.detailsPlanNum.rmbExportamount = this.$refs.unitTabs.sumInfo.exportedAmountRMB //表头-外销总价（￥)
             this.$refs.unitTabs.sumInfo.excludingTaxProcessing =e.toFixed(2)//
             f=Number(this.$refs.unitTabs.sumInfo.ingAmount)+Number(this.$refs.unitTabs.sumInfo.shipProcesFees)
-            this.$refs.unitTabs.sumInfo.amountTotal = Number(this.$refs.unitTabs.sumInfo.fabricExcludTax)+Number(this.$refs.unitTabs.sumInfo.ingExcludAmount)+Number( this.$refs.unitTabs.sumInfo.shipProcesFees)//合计金额
+            this.$refs.unitTabs.sumInfo.amountTotal = (Number(this.$refs.unitTabs.sumInfo.fabricExcludTax)+Number(this.$refs.unitTabs.sumInfo.ingExcludAmount)+Number( this.$refs.unitTabs.sumInfo.shipProcesFees)).toFixed(2)//合计金额
             this.pagination = {
               total: res.result.total,
               current: res.result.current,
@@ -589,7 +642,37 @@ export default {
         })
       })
     },
-
+    uploadFlie(file) {
+      this.fileName = file.name
+      },
+      handleImportExcel(data){
+        if(data.fileList.length>this.fileList.length&&data.file.status=='uploading'){ 
+          var that =this
+          setTimeout(()=>{
+            that.onSearch('query')
+        },1000)
+          
+        }
+        
+        
+      },
+      removeFile(data){
+        deleteFileDetail({code:this.detailsPlanNum.planNum,name:data.name}).then(res => {
+            if (res.success) {
+              var cc=[]
+              this.fileList.map(item=>{
+                if(item.name !== data.name){
+                  cc.push(item)
+                }
+              })
+              this.fileList = cc
+              this.loading =false
+              this.$message.success('删除成功');
+            }else{
+              this.$message.error(res.message);
+            }
+          })
+      },
     //调整表头格式
     adjustingHeader(){
       this.detailsPlanNum.outdata = ( this.detailsPlanNum.outdata==''||!this.detailsPlanNum.outdata)?'':moment( this.detailsPlanNum.outdata).format('YYYY-MM-DD')
@@ -599,7 +682,7 @@ export default {
       this.detailsPlanNum.actualShipquantity=( this.detailsPlanNum.actualShipquantity==''|| !this.detailsPlanNum.actualShipquantity)?'':Number( this.detailsPlanNum.actualShipquantity).toFixed(0)//实际出库数量
       this.detailsPlanNum.rmbExportamount=( this.detailsPlanNum.rmbExportamount==''|| !this.detailsPlanNum.rmbExportamount)?'':Number( this.detailsPlanNum.rmbExportamount).toFixed(2)//人民币外销金额
       this.detailsPlanNum.usdExpense=( this.detailsPlanNum.usdExpense==''|| !this.detailsPlanNum.usdExpense)?'':Number( this.detailsPlanNum.usdExpense).toFixed(2)//美元费用支出
-      this.detailsPlanNum.rmbProcesscost=( this.detailsPlanNum.rmbProcesscost==''|| !this.detailsPlanNum.rmbProcesscost)?'':Number( this.detailsPlanNum.rmbProcesscost).toFixed(2)//加工费(人民币)
+      // this.detailsPlanNum.rmbProcesscost=( this.detailsPlanNum.rmbProcesscost==''|| !this.detailsPlanNum.rmbProcesscost)?'':Number( this.detailsPlanNum.rmbProcesscost).toFixed(2)//加工费(人民币)
       this.detailsPlanNum.accidentUsdamount=( this.detailsPlanNum.accidentUsdamount==''|| !this.detailsPlanNum.accidentUsdamount)?'':Number( this.detailsPlanNum.accidentUsdamount).toFixed(2)//事故单美元金额
       this.detailsPlanNum.fabriccostIncludestax=( this.detailsPlanNum.fabriccostIncludestax==''|| !this.detailsPlanNum.fabriccostIncludestax)?'':Number( this.detailsPlanNum.fabriccostIncludestax).toFixed(2)//面料含税成本
       this.detailsPlanNum.excipiencostIncludestax=( this.detailsPlanNum.excipiencostIncludestax==''|| !this.detailsPlanNum.excipiencostIncludestax)?'':Number( this.detailsPlanNum.excipiencostIncludestax).toFixed(2)//辅料含税成本
@@ -611,43 +694,46 @@ export default {
       this.color1 = Number(this.detailsPlanNum.rmbExportamount)-Number(this.detailsPlanNum.fabriccostNotincludestax)-Number(this.detailsPlanNum.excipiencostNotincludestax)-Number(this.detailsPlanNum.rmbProcesscost)-Number(this.detailsPlanNum.rmbExpense)
       this.color2 = this.color1/Number(this.detailsPlanNum.usdTotalexportprice)
       this.color2 = this.color2>0?this.color2:-this.color2
+      if(this.detailsPlanNum.pkOrg=='103'){
+        this.detailsPlanNum.rmbProcesscost = (Number(this.detailsPlanNum.rmbProcesscost)/(1+(Number(this.detailsPlanNum.taxrate)/100))).toFixed(2)
+      }
     },
 
-    //计算短出货值
+    //计算出运明细合计行
     calculation(val){
-      var  average = 0
-       val.map(item=>{
-        if(item.outdata !=='合计'){
-          average += (Number(item.exportUnitPrice)*Number(item.shipQuantity)*Number(item.exchangeRate))
-        }
-       })
-       this.detailsPlanNum.shortvalue = average.toFixed(2)
+      // var  average = 0
+      //  val.map(item=>{
+      //   if(item.outdata !=='合计'){
+      //     average += (Number(item.exportUnitPrice)*Number(item.shipQuantity)*Number(item.exchangeRate))
+      //   }
+      //  })
+      //  this.detailsPlanNum.shortvalue = average.toFixed(2)
        var shipQuantityAll =0,
-        exportUnitPriceALll = 0,
+        // exportUnitPriceALll = 0,
         exportPriceAll =0,
         rmbAmountAll = 0,
-        procesUnitPricermbAll = 0,
-        procesUnitPriceusdAll = 0,
+        // procesUnitPricermbAll = 0,
+        // procesUnitPriceusdAll = 0,
         processCostAll = 0
         val.map(item=>{
           if(item.outdata !=='合计'){
           shipQuantityAll+=Number(item.shipQuantity)
-          exportUnitPriceALll+=Number(item.exportUnitPrice)
+          // exportUnitPriceALll+=Number(item.exportUnitPrice)
           exportPriceAll+=Number(item.exportPrice)
           rmbAmountAll+=Number(item.rmbAmount)
-          procesUnitPricermbAll+=Number(item.procesUnitPricermb)
-          procesUnitPriceusdAll+=Number(item.procesUnitPriceusd)
+          // procesUnitPricermbAll+=Number(item.procesUnitPricermb)
+          // procesUnitPriceusdAll+=Number(item.procesUnitPriceusd)
           processCostAll+=Number(item.processCost)
           }
         })
         var allObj ={
           outdata:'合计',
           shipQuantity:shipQuantityAll.toFixed(3),
-          exportUnitPrice:exportUnitPriceALll.toFixed(3),
+          // exportUnitPrice:exportUnitPriceALll.toFixed(3),
           exportPrice:exportPriceAll.toFixed(3),
           rmbAmount:rmbAmountAll.toFixed(3),
-          procesUnitPricermb:procesUnitPricermbAll.toFixed(3),
-          procesUnitPriceusd:procesUnitPriceusdAll.toFixed(3),
+          // procesUnitPricermb:procesUnitPricermbAll.toFixed(3),
+          // procesUnitPriceusd:procesUnitPriceusdAll.toFixed(3),
           processCost:processCostAll.toFixed(3)
         }
         //发运明细-合计行
@@ -670,42 +756,27 @@ export default {
     },
     //辅料中的合计行
     addAmountIng(val){
-      var ingredientsTransferQuantityALll = 0,
+      var
       transferCostAll =0,
-      usageQuantityAll = 0,
-      purchaseQuantityAll = 0,
-      ingredientsRemainingQuantityAll = 0,
-      lossAll = 0,
       rmbAmountAll = 0,
       usdAmountAll = 0,
-      priceExcludingtaxAll = 0,
-      dosageAll = 0
+      priceExcludingtaxAll = 0
         val.map(item=>{
           if(item.goodsName!=='合计'){
-          ingredientsTransferQuantityALll+=Number(item.ingredientsTransferQuantity)
           transferCostAll+=Number(item.transferCost)
-          usageQuantityAll+=Number(item.usageQuantity)
-          purchaseQuantityAll+=Number(item.purchaseQuantity)
-          ingredientsRemainingQuantityAll+=Number(item.ingredientsRemainingQuantity)
-          lossAll+=Number(item.loss)
-          rmbAmountAll+=Number(item.rmbAmount)
-          usdAmountAll+=Number(item.usdAmount)
-          priceExcludingtaxAll+=Number(item.priceExcludingtax)
-          dosageAll+=Number(item.dosage)
+          rmbAmountAll+=item.rmbAmount?Number(item.rmbAmount):0
+          usdAmountAll+=item.usdAmount?Number(item.usdAmount):0
+          priceExcludingtaxAll+=item.priceExcludingtax?Number(item.priceExcludingtax):0
           }
         })
       var allObj ={
           goodsName:'合计',
-          ingredientsTransferQuantity:ingredientsTransferQuantityALll,
           transferCost:transferCostAll,
-          usageQuantity:usageQuantityAll,
-          purchaseQuantity:purchaseQuantityAll,
-          ingredientsRemainingQuantity:ingredientsRemainingQuantityAll,
-          loss:lossAll,
           rmbAmount:rmbAmountAll,
           usdAmount:usdAmountAll,
           priceExcludingtax:priceExcludingtaxAll,
-          dosage:dosageAll
+          ingredientsTransferQuantity:'',
+          ingredientsRemainingQuantity:''
         }  
         if(this.$refs.unitTabs.ingData.length!==0 ){
           if(this.$refs.unitTabs.ingData[this.$refs.unitTabs.ingData.length-1].goodsName=='合计'){this.$refs.unitTabs.ingData.pop()}
@@ -749,7 +820,7 @@ export default {
       disbursedLocalmoney:disbursedLocalmoneyALL,
       disbursedOriginalmoney:disbursedOriginalmoneyALL,
       shuiemoney:shuiemoneyAll.toFixed(3),
-      totalTaxIncrease:(disbursedLocalmoneyALL+shuiemoneyAll)
+      iNatMoney:(disbursedLocalmoneyALL+shuiemoneyAll)
      }
      if(this.costPayData.length!==0){
       if(this.costPayData[this.costPayData.length-1].setNo=='合计'){this.costPayData.pop()}
@@ -832,11 +903,13 @@ export default {
          var json = this.detailsPlanNum
          json.outdata=moment(json.outdata).format('YYYY-MM-DD hh:mm:ss')
         addHalfInfo(json).then(res => {
+          this.isDisabled = false
           if (res.success) {
             console.log('保存的部分信息', halfInfo)
             this.$message.success('保存成功')
-
             halfInfo = {}
+          }else{
+            this.$message.error(res.message);
           }
         })
       } else {
@@ -858,6 +931,9 @@ export default {
       this.$refs.mainTableExpenseUSDModal.mainTableExpenseUSDData = this.costPayData
       this.$refs.mainTableExpenseUSDModal.fixedData = this.costPayData
     },
+    orderDataChange(data){
+      this.detailsPlanNum.queryTime = moment(data).format('yyyy-MM-DD')
+    },
 
     // 事故单 单号 弹框
     accidentListCustomCell(record) {
@@ -875,13 +951,21 @@ export default {
         }
       }
     },
+    number(data1,data2){
+      this.detailsPlanNum.fabriccostNotincludestax =  data1
+      this.detailsPlanNum.excipiencostNotincludestax =  data2
+    },
 
     // father 方法
     aa() {},
     bb() {},
     cc() {}
   },
-  computed: {},
+  computed: {
+    importExcelUrl: function() {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    },
+  },
   mounted() {}
 }
 </script>

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

@@ -63,11 +63,11 @@
           </span>
             <!--辅料-转入数量 弹框-->
             <span slot="ingInQuaSlot" slot-scope="text">
-              <a>{{ Number(text).toFixed(4) }}</a>
+              <a v-if="text!==''">{{ Number(text).toFixed(4) }}</a>
             </span>
             <!--辅料-余下数量 弹框-->
             <span slot="ingRemQuaSlot" slot-scope="text">
-              <a>{{ Number(text).toFixed(4) }}</a>
+              <a v-if="text!==''">{{ Number(text).toFixed(4) }}</a>
             </span>
             <!-- 备注 -->
             <span slot="remarks" slot-scope="text,record">
@@ -607,7 +607,7 @@ export default {
             if (record.procesUnitPricermb == record.procesUnitPriceusd)
               return "";
             else
-              return Number(record.procesUnitPriceusd).toFixed(4);
+              return record.procesUnitPriceusd?Number(record.procesUnitPriceusd).toFixed(4):'';
            } 
         },
         {
@@ -641,10 +641,11 @@ export default {
       this.sumInfo.fabricExcludTax =''
       this.sumInfo.ingExcludAmount=''
       this.sumInfo.amountTotal=''
-      this.sumInfo.fabricExcludTax =(Number(this.sumInfo.fabricAmount)/(1+Number(data))).toFixed(2)//合计中的不含税面料总额
-      this.sumInfo.ingExcludAmount = (Number(this.sumInfo.ingAmount).toFixed(2)/(1+Number(data))).toFixed(2)//辅料不含税金额合计
-      this.sumInfo.amountTotal = Number(this.sumInfo.fabricExcludTax)+Number(this.sumInfo.ingExcludAmount)+Number( this.sumInfo.shipProcesFees)//合计金额
+      this.sumInfo.fabricExcludTax =(Number(this.sumInfo.fabricAmount)/(1+(Number(data)/100))).toFixed(2)//合计中的不含税面料总额
+      this.sumInfo.ingExcludAmount = (Number(this.sumInfo.ingAmount).toFixed(2)/(1+(Number(data)/100))).toFixed(2)//辅料不含税金额合计
+      this.sumInfo.amountTotal = (Number(this.sumInfo.fabricExcludTax)+Number(this.sumInfo.ingExcludAmount)+Number( this.sumInfo.shipProcesFees)).toFixed(2)//合计金额
       this.$forceUpdate()
+      this.$emit('number',this.sumInfo.fabricExcludTax,this.sumInfo.ingExcludAmount)
     },
     tabsCallback(key) {
       this.activeKey = key

src/views/reportForms/fabric-loss-table.vue

@@ -256,7 +256,7 @@
         
         <!-- 成本金额 -->
            <span slot="imoney" slot-scope="text,record">
-              <a v-if="(record.cbusType == '转出成本') || (record.cbusType == '转入成本')&& !record.bmanual" @click="imoneyCell(record)">{{text}}</a>
+              <a v-if="((record.cbusType == '转出成本') || (record.cbusType == '转入成本'))&& !record.bmanual" @click="imoneyCell(record)">{{text}}</a>
               <span v-if="(record.cbusType !== '转出成本') && (record.cbusType !== '转入成本') && !record.bmanual" >{{text}}</span>
               <a-input placeholder="请输入" v-model="record.imoney" v-if="record.bmanual && showSelect==0" @blur="judageNumber(record,'imoney')"/>
               <span v-if="record.bmanual && showSelect==1" >{{text}}</span>
@@ -620,6 +620,7 @@ export default {
           customCell: this.purchaseInQuantityCustomCell,
           scopedSlots: { customRender: 'purchaseInQuantity' }
         },
+        { title: '门幅', dataIndex: 'cwidth', width: '6%', className: 'replacecolor' },
         { title: '染厂色号', dataIndex: 'ccolorNumber', width:'10%', className: 'replacecolor' },
         { title: '物料编码', dataIndex: 'cinvCode', width: '7%', className: 'replacecolor noprint' },
         { title: '货物名称', dataIndex: 'cinvName', width: '20%',className: 'replacecolor specel-width' },
@@ -628,6 +629,7 @@ export default {
          { title: '多发少发', dataIndex: 'iquantityMoreLess', width: '6%', className: 'replacecolor', scopedSlots: { customRender: 'iquantityMoreLess' }, customCell: this.iquantityMoreLessCell, },
         { title: '附件', dataIndex: 'enclosure', width: '6%', className: 'noprint', scopedSlots: { customRender: 'enclosure' }}
       ],
+      
 
       // 成本发票 表头
       costInvoiceColumns: [
@@ -635,7 +637,7 @@ export default {
         { title: '采购类型', width: 120, dataIndex: 'cbusType', className: 'replacecolor' , scopedSlots: { customRender: 'cbusType' }},
         { title: '工厂', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor', scopedSlots: { customRender: 'cvenAbbName' } },
         { title: '成本金额', dataIndex: 'imoney', width: 120, className: 'replacecolor',scopedSlots: { customRender: 'imoney' } },
-        { title: '无税金额', dataIndex: 'inoTaxMoney', width: 120, className: 'replacecolor',scopedSlots: { customRender: 'inoTaxMoney' } }
+        // { title: '无税金额', dataIndex: 'inoTaxMoney', width: 120, className: 'replacecolor',scopedSlots: { customRender: 'inoTaxMoney' } }
       ],
       costInvoiceData: [
         { costInvoiceType: '纱款', factory: '17TW-C-17B', costAmount: '5081.72' },

src/views/reportForms/fabric-loss-table/accidentListModal.vue

@@ -155,6 +155,7 @@ export default {
   text-align: center;
 }
 
+
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

src/views/reportForms/fabric-loss-table/imoneyCell.vue

@@ -100,7 +100,7 @@ export default {
         },
       ],
       imoneyData:[],
-      imoneyModVis:false
+      imoneyModVis:false,
     }
   },
   // 接收父组件 方法
@@ -136,6 +136,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

src/views/reportForms/fabric-loss-table/invoiceNumModal.vue

@@ -240,6 +240,10 @@ export default {
 /deep/ .ant-table-tbody {
   text-align: center;
 }
+/deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 
 // /deep/ th.replacecolor {
 //   background-color: #ccc;

src/views/reportForms/fabric-loss-table/invoiceQuantityModal.vue

@@ -210,6 +210,10 @@ export default {
 /deep/ .ant-table-tbody {
   text-align: center;
 }
+/deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 
 // /deep/ th.replacecolor {
 //   background-color: #ccc;

src/views/reportForms/fabric-loss-table/iquantityMoreLessModal.vue

@@ -288,4 +288,8 @@ export default {
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }
+/deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 </style>

src/views/reportForms/fabric-loss-table/materialsOutQuantityModal.vue

@@ -70,7 +70,7 @@
               </span>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
+          <a-row :gutter="24" v-if="type!=='1'">
             <a-col :md="4" :sm="8">
               <a-form-item label="">
                  <a-input placeholder="请输入" v-model="editPricre"></a-input>
@@ -101,7 +101,8 @@
           :footer="showTotal"
         >
         <template slot="iprice" slot-scope="text, record, index">
-              <a-input placeholder="请输入物料名称" v-model="record.iprice"  @blur="changePrice(record)" @pressEnter="changePrice(record)"></a-input>
+              <a-input placeholder="请输入物料名称" v-model="record.iprice"  @blur="changePrice(record)" @pressEnter="changePrice(record)" v-if="type!=='1'"></a-input>
+              <span v-else>{{ record.iprice }}</span>
         </template>
         </a-table>
 
@@ -224,7 +225,7 @@ export default {
       // orderDataform: this.$form.createForm(this),
       confirmLoading: false,
       materialsOutQuantityModVis: false,
-
+     type:'',
       // 查询条件
       queryParam: {
         cbatchOut: '', // 批号
@@ -353,6 +354,7 @@ export default {
       this.$emit('close')
       this.materialsOutQuantityModVis = false
       this.allowModification = 'no'
+      this.type =''
     },
     showTotal(data) {
       return (
@@ -402,7 +404,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
-
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

src/views/reportForms/fabric-loss-table/otherYarnsInModal.vue

@@ -303,6 +303,10 @@ export default {
 /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 
 // /deep/ th.replacecolor {
 //   background-color: #ccc;

src/views/reportForms/fabric-loss-table/purchaseAmountModal.vue

@@ -333,7 +333,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
-
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

src/views/reportForms/fabric-loss-table/purchaseInQuantityModal.vue

@@ -304,6 +304,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 
 // /deep/ th.replacecolor {
 //   background-color: #ccc;

src/views/reportForms/fabric-loss-table/purchaseLeftModal.vue

@@ -284,6 +284,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

src/views/reportForms/fabric-loss-table/surplusYarnModal.vue

@@ -305,6 +305,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

src/views/reportForms/supply-capacity-table.vue

@@ -104,8 +104,9 @@
           >月份供应商合计导出</a-button
         >
         <a-button type="primary" @click="monthDepartExport('月份部门合计导出')" icon="download"
-          >月份部门合计导出</a-button
-        >
+          >月份部门合计导出</a-button>
+          <a-button type="primary" @click="detailExport('明细导出')" icon="download"
+          >明细导出</a-button>
       </div>
 
       <!-- 合计 table  rowKey="id" :scroll="{ x: 1500 }" :pagination="ipagination  -->
@@ -360,6 +361,27 @@ export default {
         }
       })
     },
+    detailExport(fileName){
+      downFile('/scas/supplierCapacity/excel4', this.queryParam).then(data => {
+        if (!data) {
+          this.$message.warning('文件下载失败')
+          return
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls')
+        } else {
+          let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', fileName + '.xls')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link) // 下载完成移除元素
+          window.URL.revokeObjectURL(url) // 释放掉blob对象
+        }
+      })
+    },
 
     // 查询按钮
     searchQuery() {