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

.env

@@ -1,6 +1,6 @@
 NODE_ENV=production
-VUE_APP_PLATFORM_NAME=JeecgBoot 企业级低代码平台
+VUE_APP_PLATFORM_NAME=森语单证系统
 # 开启单点登录
-VUE_APP_SSO=false
+VUE_APP_SSO=true
 # 开启微应用模式
 VUE_APP_QIANKUN=false

.env.production

@@ -1,5 +1,5 @@
 NODE_ENV=production
-#VUE_APP_API_BASE_URL=http://220.191.168.86:18001/jeecg-boot
-VUE_APP_API_BASE_URL=http://www.myfitt.cn:18003/jeecg-boot
+VUE_APP_API_BASE_URL=http://www.myfitt.cn:18001/jeecg-boot
+#VUE_APP_API_BASE_URL=http://www.myfitt.cn:18003/jeecg-boot
 VUE_APP_CAS_BASE_URL=http://www.myfitt.cn:18005/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

src/config/router.config.js

@@ -378,5 +378,13 @@ export const constantRouterMap = [
     path: '/404',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
   },
-
+  /* 不带左上的页面，oa引用 */
+  {
+    path: '/reportFormsSimple/fabricLossesSummary',
+    component: () => import(/* 面损表列表" */ '@/views/cost-allocation-total/fabricLossesSummary')
+  },
+  {
+    path: '/reportFormsSimple/fabricLossTable',
+    component: () => import(/* 面损表" */ '@/views/reportForms/fabric-loss-table')
+  },
 ]

src/views/book/book-list.vue

@@ -364,9 +364,9 @@ export default {
      
      if(record.isAhaa == '国内'){
        if(record.readyFabric=='成衣'){
-         var exinvoiceArr = ["报关信息-报关单","报关信息-申报要素","报关信息-发票","报关信息-合同","报关信息-装箱单","报关信息-结汇发票"]
+         var exinvoiceArr = ["-报关资料","-结汇发票"]
        }else{
-         var exinvoiceArr = ["报关信息-报关单-面料","报关信息-申报要素","报关信息-发票-面料","报关信息-合同-面料","报关信息-装箱单-面料"]
+         var exinvoiceArr = ["-报关资料"]
        }
     }else{//
       var exinvoiceArr = ["国外-报关信息-装箱单","国外-报关信息-发票","国外-报关信息-托书"]

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

@@ -93,6 +93,10 @@
         :scroll="{ x: 1500 }"
         @change="handleTableChange"
       >
+      <span slot="action" slot-scope="text, record">
+          <a @click="handleApply(record)" v-if="apply == 1">发起申请</a>
+          
+        </span>
       </a-table>
     </a-card>
 
@@ -190,6 +194,13 @@ export default {
           className: 'replacecolor',
         },
         { title: '制单人', width: 120, dataIndex: 'makingPeople', ellipsis: true,className: 'replacecolor' },
+         {
+            title: '操作',
+            dataIndex: 'action',
+            scopedSlots: { customRender: 'action' },
+            align: 'center',
+            width: 80
+          }
 
       ],
       fabricLossesData: [],
@@ -204,10 +215,12 @@ export default {
       pagination: {
       },
       dateFormat: 'YYYY-MM-DD',
-      loading: false // 表格加载
+      loading: false, // 表格加载
+      apply:"",
     }
   },
   created() {
+    this.apply = this.$route.query.apply;
     this.getCostList()
   },
   methods: {
@@ -243,6 +256,13 @@ export default {
       this.queryParam.pageNo = pagination.current
       this.getCostList()
     },
+    handleApply(record){
+      var data = {
+        type:"面损表",
+        ccode:record.ccode,
+      };
+      window.parent.postMessage({msg:"startApply", data:data}, "*");
+    },
   },
   computed: {},
   mounted() {}

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

@@ -24,7 +24,7 @@
                   @search="onSearch($event,'0')"
                   v-show='showSelect==1'
                 />
-                <a-button type="primary" :disabled="edit == '0'" @click="onSearch(planNO,'1')" class="noprint">更新</a-button>
+                <a-button type="primary" :disabled="edit == '0'" @click="onSearch(planNO,'1')" class="noprint" v-if="!isView">更新</a-button>
               </a-form-model-item>
             </a-col>
 
@@ -375,7 +375,7 @@
       </div> -->
 
       <!-- 页面底部保存 -->
-      <a-row :gutter="24" style="marginTop:40px;float:right" class="noprint">
+      <a-row :gutter="24" style="marginTop:40px;float:right" class="noprint" v-if="!isView">
         <a-col :md="12" :sm="12" style="display:flex">
           <a-button type="primary" @click="daYin" style="margin-right:6px" :disabled ="PrintButton">
             打印
@@ -477,6 +477,7 @@ export default {
       },
       edit:'0',
       planNO:'',//计划单号
+      isView:false,//是否查看状态
       // 采购订单 表头
       purchaseOrderColumns: [
         { title: '货物名称', width: '21%', dataIndex: 'cinvName', className: 'replacecolor specel-width'},
@@ -1424,6 +1425,29 @@ export default {
     //   item.ioriSum = parseFloat(ioriSum.toFixed(4));
     //   return [item];
     // }
+  },
+  created(){
+    var ccode = this.$route.query.ccode;
+    /*
+    console.log("----------------ccode 1:"+ccode);
+
+    var url = window.location.href ;             //获取当前url
+    var dz_url = url.split('#')[0];                //获取#/之前的字符串
+    var cs = dz_url.split('?')[1];                //获取?之后的参数字符串
+    var cs_arr = cs.split('&');                    //参数字符串分割为数组
+    var cs={};
+    for(var i=0;i<cs_arr.length;i++){         //遍历数组，拿到json对象
+      cs[cs_arr[i].split('=')[0]] = cs_arr[i].split('=')[1]
+    }
+    ccode = cs.ccode;
+        console.log("----------------ccode 2:"+ccode);     */
+        
+    if (ccode != undefined && ccode != ""){
+      this.planNO = ccode;
+      this.showSelect=1;
+      this.isView = true;
+      this.onSearch(this.planNO,'0');
+    }
   }
 }
 </script>