Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/components/fee-info/main.vue

@@ -14,9 +14,9 @@
       >
         <template slot="menuLeft">
           <el-tabs v-model="activeName" @tab-click="tabHandle">
-            <el-tab-pane label="应收" name="first" :key="'first'">
+            <el-tab-pane label="应收" name="first" :key="'first'" v-if="tabShow == 1 || tabShow == 2">
             </el-tab-pane>
-            <el-tab-pane label="应付" name="second" :key="'second'">
+            <el-tab-pane label="应付" name="second" :key="'second'" v-if="tabShow == 1 || tabShow == 3">
             </el-tab-pane>
           </el-tabs>
           <el-button
@@ -383,7 +383,12 @@ export default {
     inCropId: {
       type: Boolean,
       default: false
-    }
+    },
+    // 1.显示全部 2.收费 3.付费
+    tabShow: {
+      type: Number,
+      default: 1,
+    },
   },
   filters: {
     isPercentage(val) {
@@ -400,6 +405,8 @@ export default {
     }
   },
   async created() {
+    // 判断tabShow的activeName默认的显示
+    this.activeName = this.tabShow == 1? 'first': this.tabShow == 2? 'first': 'second';
     this.feeOption = await this.getColumnData(
       this.getColumnName(33),
       feeOption

src/views/businessManagement/purchaseOrder/configuration/mainList.json

@@ -215,7 +215,7 @@
     },
     {
       "label": "是否生成发货",
-      "prop": "createReceiving",
+      "prop": "createFreight",
       "search": false,
       "index": 19,
       "width": 100,
@@ -223,11 +223,19 @@
     },
     {
       "label": "生成发货时间",
-      "prop": "createReceivingTime",
+      "prop": "createFreightTime",
       "search": false,
       "index": 20,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "发货人",
+      "prop": "createFreightUser",
+      "search": false,
+      "index": 21,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -229,7 +229,7 @@
               <el-button type="warning"
                          icon="el-icon-plus"
                          size="small"
-                         :disabled="selection.length < 1 || detailData.seeDisabled"
+                         :disabled="selection.length < 1 || detailData.seeDisabled || form.createFreight == 1"
                          @click="getShipmentC">生成工厂发货
               </el-button>
               <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()">报 表</el-button>
@@ -245,6 +245,7 @@
           itemType="采购"
           @beforeFinance="beforeFinance"
           :corpId="form.corpId"
+          :tabShow="3"
         />
         <containerTitle title="附件上传"></containerTitle>
         <c-upload

src/views/businessManagement/purchaseOrder/index.vue

@@ -46,8 +46,8 @@
         <template slot-scope="scope" slot="createUser">
           {{ scope.row.createUserName }}
         </template>
-        <template slot-scope="scope" slot="createReceiving">
-          {{ scope.row.createReceiving == 1? '是': '否' }}
+        <template slot-scope="scope" slot="createFreight">
+          {{ scope.row.createFreight == 1? '是': '否' }}
         </template>
         <template slot-scope="scope" slot="menu">
 <!--          <el-button-->

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -110,7 +110,7 @@
                 <el-radio-group v-else-if="item.prop === 'assistantConfirm'" v-model="form[item.prop]" :disabled="detailData.seeDisabled || receiveDisabled" @change="assistantConfirmChange">
                    <el-radio label="1">是</el-radio>
                    <el-radio label="0">否</el-radio>
-                </el-radio-group>                
+                </el-radio-group>
                 <warehouse-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]"
                                   :configuration="configurationWarehouse" style="width: 100%" :disabled="detailData.seeDisabled || receiveDisabled"/>
                 <el-input
@@ -629,26 +629,26 @@ export default {
               label: "操作人",
               prop: "logisticsConfirmUser",
               disabled:true
-          },   
+          },
           {
               label: "操作时间",
               prop: "logisticsConfirmTime",
               disabled:true
-          },  
+          },
           {
               label: "助理确认",
               prop: "assistantConfirm",
-          }, 
+          },
           {
               label: "操作人",
               prop: "assistantConfirmUser",
               disabled:true
-          },   
+          },
           {
               label: "操作时间",
               prop: "assistantConfirmTime",
               disabled:true
-          },                                       
+          },
           {
             label: "入库单备注",
             span: 24,
@@ -753,6 +753,7 @@ export default {
       this.queryData(this.detailData.id)
     }else if (this.detailData.form){
       this.form = JSON.parse(this.detailData.form);
+      this.$set(this.form, 'orgId', this.form.id);
       delete this.form.createTime
       delete this.form.id
       delete this.form.sysNo

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -349,20 +349,44 @@
       "overHidden": true
     },
     {
-      "label": "是否生成收货",
-      "prop": "createReceiving",
+      "label": "采购人",
+      "prop": "createPurchaseUser",
       "search": false,
       "index": 30,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "生成收货时间",
-      "prop": "createReceivingTime",
+      "label": "是否生成收货",
+      "prop": "createFreight",
       "search": false,
       "index": 31,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "生成收货时间",
+      "prop": "createFreightTime",
+      "search": false,
+      "index": 32,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "收货人",
+      "prop": "createFreightUser",
+      "search": false,
+      "index": 33,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "请核状态",
+      "prop": "status",
+      "search": false,
+      "index": 33,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -61,7 +61,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-              :disabled="detailData.seeDisabled || form.status != 3"
+              :disabled="detailData.seeDisabled || form.status != 3 || form.createPurchase == 1"
               @click.native="saveSell">生成采购
             </el-dropdown-item>
             <el-dropdown-item
@@ -383,10 +383,11 @@
                          v-show="goodsActives == 'goods'"
               >政策
               </el-button>
+<!--              禁用规则：未选择明细，未点击编辑按钮，未进行审批，已经生成过-->
               <el-button type="warning"
                          icon="el-icon-plus"
                          size="small"
-                         :disabled="selection.length < 1 || detailData.seeDisabled || !form.status || form.status < 3"
+                         :disabled="selection.length < 1 || detailData.seeDisabled || !form.status || form.status < 3 || form.createFreight == 1"
                          @click="getShipmentD"
                          v-show="goodsActives == 'goods'">生成客户收货
               </el-button>
@@ -442,6 +443,7 @@
           @beforeFinance="beforeFinance"
           :corpId="form.corpId"
           :financeDisabled="false"
+          :tabShow="2"
         />
         <containerTitle title="上传附件"></containerTitle>
         <c-upload
@@ -2882,8 +2884,8 @@ export default {
           goodsData.forEach(item => allNum += Number(item.orderQuantity));
           goodsData.filter(item => item.inputMold === 1).forEach(item => specialNum += Number(item.orderQuantity));
           goodsData.filter(item => Number(item.size) >= 17).forEach(item => sizeNum += Number(item.orderQuantity));
-          this.$set(this.form, 'specialOfferOf', (specialNum / allNum * 100).toFixed(2));
-          this.$set(this.form, 'largeScale', (sizeNum / allNum * 100).toFixed(2));
+          this.$set(this.form, 'specialOfferOf', allNum == 0? '0.00': (specialNum / allNum * 100).toFixed(2));
+          this.$set(this.form, 'largeScale', allNum == 0? '0.00': (sizeNum / allNum * 100).toFixed(2));
           for (let item in this.goodsData) {
             if (Number(goodsData[item].orderQuantity) > Number(goodsData[item].storageQuantity)) {
               return this.$message.error('商品信息第'+ (parseInt(item) + 1) + '行订货数量不能超过库存')

src/views/businessManagement/salesOrder/index.vue

@@ -62,8 +62,14 @@
         <template slot-scope="scope" slot="createPurchase">
           {{ scope.row.createPurchase == 1? '是': '否' }}
         </template>
-        <template slot-scope="scope" slot="createReceiving">
-          {{ scope.row.createReceiving == 1? '是': '否' }}
+        <template slot-scope="scope" slot="createFreight">
+          {{ scope.row.createFreight == 1? '是': '否' }}
+        </template>
+        <template slot="status" slot-scope="scope">
+          <span v-if="scope.row.status == 0">暂存</span>
+          <span v-else-if="scope.row.status == 1">提交请核</span>
+          <span v-else-if="scope.row.status == 2">审批中</span>
+          <span v-else-if="scope.row.status == 3">审批通过</span>
         </template>
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
@@ -80,7 +86,7 @@
             type="text"
             size="small"
             @click="saveSell(scope.row)"
-            :disabled="scope.row.status < 3"
+            :disabled="scope.row.status < 3 || scope.row.createPurchase == 1"
           >生成采购</el-button>
           <el-button
             type="text"

src/views/wel/components/quick-launch.vue

@@ -97,6 +97,12 @@
           <i class="tradingIcon icon-pay" style="color:#7E8270"></i>
           <span>付费</span>
         </div>
+        <div class="content-icon" @click="inPage('smart')">
+          <div style="width: 36px;height: 37px;border-radius: 10px;background-color: #0771e3;text-align: center;">
+            <i class="el-icon-basketball" style="color:#FFFFFF;font-size: 26px;line-height: 37px;"></i>
+          </div>
+          <span>智慧大屏</span>
+        </div>
       </div>
       <div class="content" v-if="sysType == 6">
         <div class="content-icon" @click="inPage('cg')">
@@ -113,14 +119,22 @@
 </template>
 
 <script>
+import { getToken } from "@/util/auth";
 export default {
   name: "basicContainer",
   data() {
-    return {};
+    return {
+      largeScreenToken: '',
+    };
   },
   props: {
     sysType: Number
   },
+  created() {
+    this.getWorkDicts('large_screen').then(res => {
+      this.largeScreenToken = res.data.data[0].dictKey;
+    })
+  },
   methods: {
     inPage(type) {
       //出口
@@ -182,6 +196,10 @@ export default {
               "/financialManagement/paymentSettle/paymentSettle"
             );
             break;
+          case "smart":
+            console.log(this.largeScreenToken)
+            window.open( 'http://119.3.74.195:9527/view/'+ this.largeScreenToken +'?token=' + getToken())
+            break;
         }
       } else if (this.sysType == 3) {
         switch (type) {