yangbifan преди 2 години
родител
ревизия
218d4d89ec
променени са 3 файла, в които са добавени 412 реда и са изтрити 433 реда
  1. 76 136
      src/pages/main/advertising/acceptance.vue
  2. 21 29
      src/pages/main/advertising/businessHall.vue
  3. 315 268
      src/pages/main/advertising/materialApplicationExa.vue

+ 76 - 136
src/pages/main/advertising/acceptance.vue

@@ -1,88 +1,40 @@
 <template>
     <div>
         <div class="container">
-            <el-form
-                :model="infolist"
-                ref="infolist"
-                :rules="rules"
-                class="container-box"
-                label-width="80px"
-            >
+            <el-form :model="infolist" ref="infolist" :rules="rules" class="container-box" label-width="80px">
                 <div>
                     <div class="section2">
-                        <a
-                            href="#"
-                            style="margin: 20px 0;margin-right: 20px;"
-                            @click="dialogApplication(1)"
-                            >验收清单</a
-                        >
-                        <a
-                            href="#"
-                            style="margin: 20px 0;margin-right: 20px;"
-                            @click="dialogApplication(2)"
-                            >发货回执</a
-                        >
+                        <a href="#" style="margin: 20px 0;margin-right: 20px;" @click="dialogApplication(1)">验收清单</a>
+                        <aX href="#" style="margin: 20px 0;margin-right: 20px;" @click="dialogApplication(2)">发货回执</aX>
                     </div>
                     <div>
                         <el-form-item class="info-line online">
                             <span>验收说明</span>
-                            <el-input
-                                v-model="examDescription"
-                                type="textarea"
-                                :rows="4"
-                            ></el-input>
+                            <el-input v-model="examDescription" type="textarea" :rows="4"></el-input>
                         </el-form-item>
                     </div>
 
                     <div>
                         <el-form-item class="info-line online">
                             <span>验收证明</span>
-                            <myUpload
-                                @uploadBack="uploadBack"
-                                :fileInfo="fileInfo"
-                                :fileList="fileInfo.fileList"
-                            >
+                            <myUpload @uploadBack="uploadBack" :fileInfo="fileInfo" :fileList="fileInfo.fileList">
                             </myUpload>
                         </el-form-item>
                     </div>
                 </div>
 
                 <div class="t-footer t-footer1">
-                    <el-button
-                        type="primary"
-                        style="width: 120px"
-                        @click="dialogCli(1)"
-                        >完 成</el-button
-                    >
-                    <el-button @click="dialogCli(2)" style="width: 120px"
-                        >取 消</el-button
-                    >
+                    <el-button type="primary" style="width: 120px" @click="dialogCli(1)">完 成</el-button>
+                    <el-button @click="dialogCli(2)" style="width: 120px">取 消</el-button>
                 </div>
             </el-form>
         </div>
-        <el-dialog
-            title="验收清单"
-            :visible.sync="ysListDialogStatus"
-            width="50%"
-            :destroy-on-close="true"
-            :modal-append-to-body="false"
-            :close-on-click-modal="false"
-        >
-            <el-form
-                :model="infolist"
-                ref="infolist"
-                :rules="rules"
-                style="height: 50vh;overflow-y: scroll; width:100%"
-                :fullscreen="true"
-            >
+        <el-dialog title="验收清单" :visible.sync="ysListDialogStatus" width="50%" :destroy-on-close="true"
+            :modal-append-to-body="false" :close-on-click-modal="false">
+            <el-form :model="infolist" ref="infolist" :rules="rules" style="height: 50vh;overflow-y: scroll; width:100%"
+                :fullscreen="true">
                 <div class="info-line">
-                    <el-table
-                        :data="tableData"
-                        style="width: 100%;"
-                        border
-                        size="large"
-                        
-                    >
+                    <el-table :data="tableData" style="width: 100%;" border size="large">
                         <el-table-column prop="id" label="物料ID">
                         </el-table-column>
                         <el-table-column prop="regionName" label="地市公司">
@@ -115,50 +67,34 @@
                         </el-table-column>
                         <el-table-column prop="price" label="单价">
                         </el-table-column>
-                        <el-table-column
-                            prop="quantity"
-                            label="数量"
-                            width="100"
-                        >
+                        <el-table-column prop="quantity" label="数量" width="100">
                         </el-table-column>
                         <el-table-column prop="priority" label="优先级">
                         </el-table-column>
                         <el-table-column label="结算金额" width="140px" prop="settlementAmount">
                             <template slot-scope="scope">
-                            <div>
-                                {{
-                                    scope.row.quantity *
+                                <div>
+                                    {{
+                                        scope.row.quantity *
                                         scope.row.price *
                                         scope.row.coefficient
-                                }}
-                            </div>
-                        </template>
+                                    }}
+                                </div>
+                            </template>
                         </el-table-column>
                     </el-table>
                 </div>
             </el-form>
 
             <div class="t-footer">
-                <el-button type="primary" @click="downloadExcel">下载</el-button
-                >
-                
+                <el-button type="primary" @click="downloadExcel">下载</el-button>
+
                 <el-button @click="ysListDialogStatus = false">取 消</el-button>
             </div>
         </el-dialog>
-        <el-dialog
-            title="发货回执"
-            :visible.sync="feedbackListDialogStatus"
-            width="30%"
-            :destroy-on-close="true"
-            :modal-append-to-body="false"
-            :close-on-click-modal="false"
-        >
-            <el-form
-                :model="infolist"
-                ref="infolist"
-                :rules="rules"
-                style="height: 20vh;"
-            >
+        <el-dialog title="发货回执" :visible.sync="feedbackListDialogStatus" width="30%" :destroy-on-close="true"
+            :modal-append-to-body="false" :close-on-click-modal="false">
+            <el-form :model="infolist" ref="infolist" :rules="rules" style="height: 20vh;">
                 <div class="info-line">
                     <!-- <a :href="feedbackList">{{ feedbackList }}</a> -->
                     {{ feedbackList }}
@@ -169,17 +105,11 @@
                 <!-- <el-button type="primary" @click="dialogSubmit()"
                     >确 定</el-button
                 > -->
-                <el-button @click="feedbackListDialogStatus = false"
-                    >取 消</el-button
-                >
+                <el-button @click="feedbackListDialogStatus = false">取 消</el-button>
             </div>
         </el-dialog>
-        <myMessage
-            :messTit="messTit"
-            @closeMessage="closeMessage(1)"
-            :centerDialogVisible="centerDialogVisible"
-            v-if="centerDialogVisible"
-        ></myMessage>
+        <myMessage :messTit="messTit" @closeMessage="closeMessage(1)" :centerDialogVisible="centerDialogVisible"
+            v-if="centerDialogVisible"></myMessage>
     </div>
 </template>
 <script>
@@ -255,11 +185,11 @@ export default {
                     headers: {
                         "Content-Type": "application/json"
                     },
-                    data: { 
+                    data: {
                         woId: this.params.woId,
                         cityWoId: this.params.cityWoId,
                         countryWoId: this.params.countyWoId
-                        }
+                    }
                 }).then(res => {
                     this.tableData = res.data;
                     // this.feedbackList = res.data.receipt;
@@ -297,8 +227,8 @@ export default {
                 // this.examList.woId = this.params.woId;
 
                 this.examList.woId = this.params.woId,
-                this.examList.woCityId = this.params.cityWoId,
-                this.examList.id = this.params.countyWoId
+                    this.examList.woCityId = this.params.cityWoId,
+                    this.examList.id = this.params.countyWoId
                 this.examList.attList = JSON.stringify(fileList);
                 this.examList.remark = this.examDescription;
                 this.submitInfo(
@@ -310,7 +240,7 @@ export default {
                 // this.infolist = {};
                 // this.attList = [];
                 // this.examDescription = "";
-                this.$router.push({ path: '/materialApplication'});
+                this.$router.push({ path: '/materialApplication' });
                 return;
             }
         },
@@ -354,40 +284,40 @@ export default {
                 }
             });
         },
-        downloadExcel(){
+        downloadExcel() {
             this.$http({
-                    url: "/market/cadvBusiMetirialWo/export",
-                    method: "post",
-                    headers: {
-                        "Content-Type": "application/json"
-                    },
-                    responseType: "blob",
-                    data: { id: this.params.woId }
-                }).then(res => {
-                    if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-                        let blob = new Blob([res.data], {
-                            type: "application/vnd.ms-excel"
-                        });
-                        window.navigator.msSaveOrOpenBlob(
-                            blob,
-                            // this.wo.bizName + ".xlsx"
-                            "验收清单" + ".xlsx"
-                        );
-                    } else {
-                        /* 火狐谷歌的文件下载方式 */
-                        var blob = new Blob([res.data]);
-                        var downloadElement = document.createElement("a");
-                        var href = window.URL.createObjectURL(blob);
-                        downloadElement.href = href;
-                        downloadElement.download = "验收清单" + ".xlsx";
-                        document.body.appendChild(downloadElement);
-                        downloadElement.click();
-                        document.body.removeChild(downloadElement);
-                        window.URL.revokeObjectURL(href);
-
-                        this.ysListDialogStatus = false
-                    }
-                });
+                url: "/market/cadvBusiMetirialWo/export",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                responseType: "blob",
+                data: { id: this.params.woId }
+            }).then(res => {
+                if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                    let blob = new Blob([res.data], {
+                        type: "application/vnd.ms-excel"
+                    });
+                    window.navigator.msSaveOrOpenBlob(
+                        blob,
+                        // this.wo.bizName + ".xlsx"
+                        "验收清单" + ".xlsx"
+                    );
+                } else {
+                    /* 火狐谷歌的文件下载方式 */
+                    var blob = new Blob([res.data]);
+                    var downloadElement = document.createElement("a");
+                    var href = window.URL.createObjectURL(blob);
+                    downloadElement.href = href;
+                    downloadElement.download = "验收清单" + ".xlsx";
+                    document.body.appendChild(downloadElement);
+                    downloadElement.click();
+                    document.body.removeChild(downloadElement);
+                    window.URL.revokeObjectURL(href);
+
+                    this.ysListDialogStatus = false
+                }
+            });
         },
         closedia() {
             this.infolist = {};
@@ -429,7 +359,7 @@ export default {
             // this.getList(this.params);
         }
     },
-    created() {}
+    created() { }
 };
 </script>
 <style scoped lang="scss">
@@ -438,6 +368,7 @@ a {
     color: #169bd5;
     cursor: pointer;
 }
+
 .img-box {
     height: calc(100vh - 240px);
     overflow-y: scroll;
@@ -535,10 +466,12 @@ a {
     padding-right: 20px;
     margin-top: 20px;
 }
+
 .t-footer1 {
     padding-right: 0;
     margin-top: 80px;
 }
+
 .onetab {
     padding: 20px;
     height: calc(100% - 180px);
@@ -621,13 +554,16 @@ a {
     display: flex;
     align-items: center;
     margin-bottom: 20px;
+
     button {
         margin-bottom: 0 !important;
     }
+
     h3 {
         margin-right: 40px;
     }
 }
+
 ::v-deep.online .el-form-item__content {
     width: 100%;
     margin-left: 0 !important;
@@ -637,9 +573,11 @@ a {
     width: 100% !important;
     padding: 0 !important;
 }
+
 .el-row {
     margin: 0 !important;
 }
+
 .tree {
     width: calc(50% - 60px) !important;
     display: inline-block;
@@ -680,9 +618,11 @@ a {
         margin-bottom: 5px;
     }
 }
+
 ::v-deep.container .el-upload-dragger {
     height: 120px !important;
 }
+
 .upload-demo {
     width: 60% !important;
 }

+ 21 - 29
src/pages/main/advertising/businessHall.vue

@@ -166,8 +166,8 @@
                         </el-form-item>
                         <el-form-item prop="sceneName">
                             <span>使用场景</span>
-                            <el-select @change="accountcho"  v-model="infolist.sceneName"
-                                placeholder="使用场景" :disabled="disableStatus">
+                            <el-select @change="accountcho" v-model="infolist.sceneName" placeholder="使用场景"
+                                :disabled="disableStatus">
                                 <el-option v-for="item in sceneOpt" :key="item.dataCode" :label="item.dataName"
                                     :value="item.dataName">
                                 </el-option>
@@ -194,7 +194,7 @@
                             <span>物料编码</span>
                             <el-input v-model="infolist.metirialCode" disabled></el-input>
                         </el-form-item>
-                        <el-form-item >
+                        <el-form-item>
                             <span>物料名称</span>
                             <el-select :disabled="disableStatus" v-model="infolist.metirialName" placeholder="物料名称"
                                 @change="materialNameChange">
@@ -203,7 +203,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        
+
                         <el-form-item>
                             <span>物料单位</span>
                             <el-input v-model="infolist.unit" disabled></el-input>
@@ -241,31 +241,23 @@
                             <span>单价</span>
                             <el-input :value="coefficient" placeholder="单价" disabled></el-input>
                         </el-form-item> -->
-                        <el-form-item>
+                        <!-- <el-form-item>
                             <span>优先级-仅灯箱画面填报</span>
                             <el-input v-model="infolist.priority" placeholder="优先级-仅灯箱画面填报"
                                 @keyup.native="numberVertify"></el-input>
+                        </el-form-item> -->
+                        <el-form-item  style="display: none;">
+                            <span>数量</span>
+                            <el-input v-model="infolist.quantity" placeholder="数量" :disabled="quantityDisabled"></el-input>
                         </el-form-item>
-                        <!-- <el-form-item prop="quantity">
-                                <span>数量</span>
-                                <el-input
-                                    v-model="infolist.quantity"
-                                    placeholder="数量"
-                                    :disabled="quantityDisabled"
-                                ></el-input>
-                            </el-form-item> -->
-                        <!-- <el-form-item>
+                        <el-form-item style="display: none;">
                             <span>物料单价(不含税)</span>
                             <el-input v-model="infolist.price" disabled></el-input>
-                        </el-form-item> -->
-                        <!-- <el-form-item prop="settlementAmount">
-                                <span>结算金额</span>
-                                <el-input
-                                    v-model="infolist.settlementAmount"
-                                    placeholder="结算金额"
-                                    disabled
-                                ></el-input>
-                            </el-form-item> -->
+                        </el-form-item>
+                        <el-form-item prop="settlementAmount" style="display: none;">
+                            <span>结算金额</span>
+                            <el-input v-model="infolist.settlementAmount" placeholder="结算金额" disabled></el-input>
+                        </el-form-item>
                     </div>
                 </el-form>
 
@@ -698,7 +690,7 @@ export default {
         };
     },
     computed: {
-        
+
         coefficient: function () {
             if (
                 this.infolist.width == undefined &&
@@ -741,10 +733,10 @@ export default {
             this.metirialOpt = []
             // console.log('出发bug');
             // console.log(this.infolist);
-            if(this.infolist.metirialName){
+            if (this.infolist.metirialName) {
                 this.infolist.metirialName = "";
             }
-            
+
             // console.log(this.infolist);
 
             //   this.account = v;
@@ -783,11 +775,11 @@ export default {
         //   }
         // },
         materialNameChange(v) {
-                  
+
             this.metirialInfoSingle = this.materialNameopt.filter(item => {
                 return item.metirialName == v;
             });
-           console.log(this.metirialInfoSingle);
+            console.log(this.metirialInfoSingle);
             this.infolist.metirialCode = this.metirialInfoSingle[0].metirialCode;
             // this.infolist.size = this.metirialInfoSingle[0].size;
             this.infolist.unit = this.metirialInfoSingle[0].unit;
@@ -799,7 +791,7 @@ export default {
                 this.quantityDisabled = false;
                 this.$set(this.infolist, "quantity", "");
             }
-            // this.infolist.price = this.metirialInfoSingle[0].price;
+            this.infolist.price = this.metirialInfoSingle[0].price;
             // this.infolist.metirialName = this.metirialInfoSingle[0].metirialNames;
             // console.log(this.metirialInfoSingle[0].metirialName);
             // console.log(this.infolist);

Файловите разлики са ограничени, защото са твърде много
+ 315 - 268
src/pages/main/advertising/materialApplicationExa.vue