测试冲突

public/index.html

@@ -31,14 +31,14 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
   <script type="text/javascript">
-    window.staticHost = 'http://10.230.26.15:8000/mkt/'; // 正式
-    // window.staticHost = 'http://10.149.85.91:8000/spfm/'; // 测试
-    // window.staticHost = 'http://192.168.2.92:9600';
+    // window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
+    window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
+    // window.staticHost = 'http://192.168.0.103:9600/';
     // window.staticHost = 'http://43.138.50.94:9600/';
     // window.staticHost = 'http://192.168.2.43:9600/';
 
     // document.title = "hello";
-  </script> -->
+  </script>
 
 </body>
 

public/static/js/api.config.js

@@ -1,6 +1,6 @@
 // api config
 var apiConfig = {
-  ctx: window.top.staticHost ? window.top.staticHost : "http://114.215.71.182:29600/spfm",
+  // ctx: window.top.staticHost ? window.top.staticHost : "http://114.215.71.182:29600/spfm", //不知道干啥的
   // http://114.215.71.182:29600/spfm/
   // ctx: "http://localhost:9601",//接口地址http://192.168.1.76:8090/ api-gateway
   // ctx: "http://192.168.2.192:9600/",//接口地址http://192.168.1.76:8090/ api-gateway

src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-      <router-view v-if="showRouter"></router-view>
+      <!-- <router-view v-if="showRouter"></router-view> -->
     <transition name="el-fade-in">
         <router-view />
     </transition>

src/config/dev.js

@@ -12,28 +12,19 @@ let dev = {
     TITLE:'本地环境',
     BASE_URL:"http://127.0.0.1:8080", //本地环境
     BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
-    EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
-    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
-    provincialWorkOrderfresourceId:'08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
-    riskMaterialsfresourceId:'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
+    EXCEL_URL:"http://43.138.50.94:7777" //本地excel路径
 }
 let test = {
     TITLE:'测试环境',
     BASE_URL:"http://10.149.85.91:8000/spfm", //测试环境
     BASE_API:"http://10.149.85.91:8000/api",//工作流测试环境
-    EXCEL_URL:"http://10.149.85.91:7777", //测试excel路径
-    provincialWorkOrderAreafresourceId:'33b0af93-b1ce-11ed-be6b-00505687dcd3',//通用工单地市
-    provincialWorkOrderfresourceId:'4fdbb96e-8bfd-11ed-8988-00505687dcd3',//通用工单省
-    riskMaterialsfresourceId:'3124a2d4-7209-11ed-8d6f-00505687dcd3',//风险防控
+    EXCEL_URL:"http://10.149.85.91:7777" //测试excel路径
 }
 let prod = {
     TITLE:'线上环境',
     BASE_URL:"http://10.230.26.15:8000/mkt", //线上环境
     BASE_API:"http://10.230.26.15:8000/api",//工作流线上环境
-    EXCEL_URL:"http://10.230.26.15:7777", //线上excel路径
-    provincialWorkOrderAreafresourceId:'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
-    provincialWorkOrderfresourceId:'9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
-    riskMaterialsfresourceId:'canvas',//风险防控
+    EXCEL_URL:"http://10.230.26.15:7777" //线上excel路径
 }
 export const getConfig  = () =>{
     switch(process.env.VUE_APP_ENV){

src/pages/main/advertising/businessHall.vue

@@ -5,14 +5,20 @@
             <div class="search" style="justify-content: flex-start;">
                 <el-button class="btn-check" size="medium" type="primary" @click="outlist">导出
                 </el-button>
-                <el-button class="btn-check" size="medium" type="primary" @click="exportTempletelist">下载导入模板
+                <el-button v-if="
+                    userInfo.countyName != null || userInfo.cityName != null
+                " class="btn-check" size="medium" type="primary" @click="exportTempletelist">下载导入模板
                 </el-button>
-                <myUpload style="display:inline-block;" :fileInfo="fileInfot" :fileList="fileInfot.fileList"
+                <myUpload v-if="
+                    userInfo.countyName != null || userInfo.cityName != null
+                " style="display:inline-block;" :fileInfo="fileInfot" :fileList="fileInfot.fileList"
                     @uploadBack='uploadBack'></myUpload>
-                <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" v-if="
+                <!-- <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" v-if="
                     userInfo.countyName != null || userInfo.cityName != null
                 ">添加
-                </el-button>
+                </el-button> -->
+                <!-- <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" >添加
+                </el-button> -->
             </div>
             <div class="search">
                 <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
@@ -22,7 +28,7 @@
                 </el-button>
             </div>
             <div class="tabbox">
-                <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
+                <el-table height="calc(100% - 100px)" class="com-table" ref="multipleTable" :data="tableData"
                     tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
                     <el-table-column prop="regionName" label="公司">
                     </el-table-column>
@@ -192,7 +198,7 @@
                             <span>物料名称</span>
                             <el-select :disabled="disableStatus" :popper-append-to-body="false"
                                 v-model="infolist.metirialName" placeholder="物料名称" @change="materialNameChange">
-                                <el-option v-for="(item, index) in materialNameopt" :key="index" :label="item.metirialName"
+                                <el-option v-for="(item, index) in metirialOpt" :key="index" :label="item.metirialName"
                                     :value="item.metirialName">
                                 </el-option>
                             </el-select>
@@ -210,12 +216,12 @@
                             infolist.unit == '延长米'
                         ">
                             <span>长(米)</span>
-                            <el-input type="number" v-model="infolist.length" placeholder="长" :disabled="disableStatus">
+                            <el-input oninput="value = parseInt(value) || ''"  v-model="infolist.length" placeholder="长" :disabled="disableStatus">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="width" v-if="infolist.unit == '平方米'">
                             <span>宽(米)</span>
-                            <el-input type="number" v-model="infolist.width" placeholder="宽" :disabled="disableStatus">
+                            <el-input oninput="value = parseInt(value) ||''" v-model="infolist.width" placeholder="宽" :disabled="disableStatus">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="direction">
@@ -228,10 +234,10 @@
                             <span>系数</span>
                             <el-input :value="coefficient" placeholder="系数" disabled></el-input>
                         </el-form-item>
-                        <el-form-item>
+                        <!-- <el-form-item>
                             <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="优先级-仅灯箱画面填报"
@@ -245,10 +251,10 @@
                                     :disabled="quantityDisabled"
                                 ></el-input>
                             </el-form-item> -->
-                        <el-form-item>
+                        <!-- <el-form-item>
                             <span>物料单价(不含税)</span>
                             <el-input v-model="infolist.price" disabled></el-input>
-                        </el-form-item>
+                        </el-form-item> -->
                         <!-- <el-form-item prop="settlementAmount">
                                 <span>结算金额</span>
                                 <el-input
@@ -726,6 +732,8 @@ export default {
             // return this.infolist.settlementAmount
         },
         accountcho(v) {
+            this.infolist.metirialName = ''
+            
             //   this.account = v;
             //   let x = v;
             //   if (v == "营业厅-VI改造" || v == "营业厅-常规物料") {
@@ -873,8 +881,11 @@ export default {
                     parentCompId: this.infolist.regionCode
                 }
             }).then(res => {
+                console.log(v);
+                console.log('[ 这是什么 ] >', res)
                 if (v !== 3) {
                     this.countyOpt = res.data;
+                    console.log(this.countyOpt);
                 }
 
             });
@@ -1021,6 +1032,7 @@ export default {
                                 parentCompId: this.regionOpt[i].compId
                             }
                         }).then(res => {
+                            console.log('[ res ] >', res)
                             if (this.userInfo.cityName != null && this.userInfo.countyName == null) {
                                 this.countyOpt = res.data;
                             } else if (this.userInfo.cityName != null && this.userInfo.countyName != null) {
@@ -1056,6 +1068,7 @@ export default {
                     parentCompId: "0"
                 }
             }).then(res => {
+                console.log('[ 0 ] >', res)
                 // this.regionOpt = res.data;
 
                 if (

src/pages/main/advertising/contractCap.vue

@@ -27,11 +27,7 @@
                     </el-table-column>
                     <el-table-column prop="secbuySchedule" label="使用进度">
                     </el-table-column>
-                    <!-- <el-table-column
-                        :label="item.supplierName"
-                        v-for="(item, index) in supplierArr"
-                        :key="index"
-                    >
+                    <!-- <el-table-column :label="item.supplierName" v-for="(item, index) in supplierArr" :key="index">
                         <template slot-scope="scope">
                             <div v-if="
                                 scope.row.cMkSupplierCumulativeAmounts.filter(
@@ -138,7 +134,7 @@
         </el-dialog>
         <myMessage :messTit="messTit" @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
             v-if="centerDialogVisible"></myMessage>
-</fullscreen>
+    </fullscreen>
 </template>
 <script>
 import mySearch from "../../../components/search.vue";
@@ -247,14 +243,14 @@ export default {
     },
     computed: {
 
-        //     secbuySchedule: function() {
-        //         this.infolist.secbuySchedule = (this.infolist.secbuyPreAccount - this.infolist.secbuyLastAccount) / this.infolist.secbuyPreAccount;
-        //         this.infolist.secbuySchedule = ((parseFloat(this.infolist.secbuySchedule)*100).toFixed(2));
-        //         if(isNaN(this.infolist.secbuySchedule)){
-        //             this.infolist.secbuySchedule = ''
-        //         }
-        //         return this.infolist.secbuySchedule;
-        //     }
+        secbuySchedule: function () {
+            this.infolist.secbuySchedule = (this.infolist.secbuyPreAccount - this.infolist.secbuyLastAccount) / this.infolist.secbuyPreAccount;
+            this.infolist.secbuySchedule = ((parseFloat(this.infolist.secbuySchedule) * 100).toFixed(2));
+            if (isNaN(this.infolist.secbuySchedule)) {
+                this.infolist.secbuySchedule = ''
+            }
+            return this.infolist.secbuySchedule;
+        }
     },
     methods: {
         closedia() {
@@ -391,13 +387,13 @@ export default {
             }
         },
         submitInfo(u) {
-            // callback(new Error('不能为空'))
-            // if (
-            //     this.infolist.secbuyPreAccount <=
-            //     this.infolist.secbuyLastAccount
-            // ) {
-            //     new Error("二采预算总额应大于二采剩余预算");
-            // }
+            if (
+                parseInt(this.infolist.secbuyPreAccount) <=
+                parseInt(this.infolist.costAccount)
+            ) {
+                this.$message.error('二采预算总额应大于二采剩余预算')
+                return;
+            }
 
             let _this = this;
             this.$refs.infolist.validate(valid => {
@@ -547,7 +543,7 @@ export default {
     watch: {
         "infolist.secbuyPreAccount": {
             handler(newVal) {
-                  this.infolist.secbuyLastAccount =  newVal -  this.infolist.costAccount
+                this.infolist.secbuyLastAccount = newVal - this.infolist.costAccount
             },
         },
     }

src/pages/main/advertising/materialAppNum.vue

@@ -11,8 +11,14 @@
                 <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
                     tooltip-effect="dark" size="small" border style="width: 100%" @selection-change="selectionChange"
                     v-loading="loading">
+         
+
                     <el-table-column type="selection" width="55">
                     </el-table-column>
+                    <el-table-column prop="region" label="城市">
+                    </el-table-column>
+                    <el-table-column prop="district" label="区县">
+                    </el-table-column>
                     <el-table-column prop="needName" label="业务名称">
                     </el-table-column>
                     <el-table-column prop="state" label="需求编号">

src/pages/main/advertising/materialApplication.vue

@@ -53,12 +53,12 @@
                             <!-- <el-table-column label="结算金额" prop="replyContent"></el-table-column> -->
                             <el-table-column label="麦穗" prop="gys1Price"></el-table-column>
                             <el-table-column label="神笔" prop="gys2Price"></el-table-column>
-                            <el-table-column label="状态" prop="taskname"></el-table-column>
+                            <el-table-column label="状态" prop="taskName"></el-table-column>
                             <el-table-column label="操作"  fixed="right" align="center">
                                 <template slot-scope="scope">
-                                    <el-button size="mini" type="text" @click="getinform(scope.row)" v-if="scope.row.taskname == null">
+                                    <el-button size="mini" type="text" @click="getinform(scope.row)" v-if="scope.row.taskName == null">
                                         任务下发</el-button>
-                                    <el-button size="mini" type="text" @click="chakanfaqi(scope.row)" v-if="scope.row.taskname != null">
+                                    <el-button size="mini" type="text" @click="chakanfaqi(scope.row)" v-if="scope.row.taskName != null">
                                         查看</el-button>
                                 </template>
                                  <!-- <template slot-scope="scope">
@@ -1360,7 +1360,7 @@
         // console.log(res.data[0].children);
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
-        this.request_form.title = this.infolist.needName;
+        this.request_form.title = '[市场工作台]-'+'省宣传物料申请及审批-'+ this.infolist.needName;
         // console.log(this.request_form);
         this.clickHandle(this.infolist);
        });
@@ -1672,6 +1672,7 @@
             });
     },
     saveform(){
+      // console.log(this.$refs.infolist);
        this.$refs.infolist.validate((valid) => {
           console.log(valid);
           if (valid) {

src/pages/main/advertising/materialApplicationds.vue

@@ -53,12 +53,12 @@
                             <!-- <el-table-column label="结算金额" prop="replyContent"></el-table-column> -->
                             <el-table-column label="麦穗" prop="gys1Price"></el-table-column>
                             <el-table-column label="神笔" prop="gys2Price"></el-table-column>
-                            <el-table-column label="状态" prop="taskname"></el-table-column>
+                            <el-table-column label="状态" prop="taskName"></el-table-column>
                             <el-table-column label="操作"  fixed="right" align="center">
                                 <template slot-scope="scope">
-                                    <el-button size="mini" type="text" @click="getinform(scope.row)" v-if="scope.row.taskname == null">
+                                    <el-button size="mini" type="text" @click="getinform(scope.row)" v-if="scope.row.taskName == null">
                                         任务下发</el-button>
-                                    <el-button size="mini" type="text" @click="chakanfaqi(scope.row)" v-if="scope.row.taskname != null">
+                                    <el-button size="mini" type="text" @click="chakanfaqi(scope.row)" v-if="scope.row.taskName != null">
                                         查看</el-button>
                                 </template>
                                  <!-- <template slot-scope="scope">
@@ -1344,7 +1344,7 @@
         console.log(res.data[0].children);
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
-        this.request_form.title = this.infolist.needName;
+        this.request_form.title = '[市场工作台]-'+'地市宣传物料申请及审批-'+ this.infolist.needName;
         console.log(this.request_form);
         this.clickHandle(this.infolist);
        });

src/pages/main/advertising/materiel.vue

@@ -7,7 +7,11 @@
                     :searchList="searchList"
                     @searchInfo="searchInfo"
                 ></mySearch>
-                <el-button class="btn-check" size="medium" type="primary" @click="exportTempletelist" v-if="userInfo.duty <= 9">下载导入模板
+
+                <el-button 
+                class="btn-check" 
+                size="medium" type="primary" 
+                @click="exportTempletelist" v-if="userInfo.duty <= 9" >下载导入模板
                 </el-button>
                 <el-button
                     class="btn-check"

src/pages/main/advertising/supplier.vue

@@ -31,8 +31,8 @@
 					</el-table-column>
 					<!-- <el-table-column prop="buyTypeName" label="采购类型">
 					</el-table-column> -->
-					<el-table-column prop="contractEndTime" label="截止时间">
-					</el-table-column>
+					<!-- <el-table-column prop="contractEndTime" label="截止时间">
+					</el-table-column> -->
                     <el-table-column label="操作" width="160px" align="center">
                         <template slot-scope="scope">
                             <el-button size="mini" type="primary" @click="dialogCheck(1,scope.row)">查看</el-button>
@@ -59,7 +59,7 @@
                         </el-form-item>
 						<el-form-item>
                             <span>供应商编码</span>
-                            <el-input v-model="infolist.code" placeholder="供应商编码" disabled></el-input>
+                            <el-input v-model="infolist.code" placeholder="供应商编码" ></el-input>
                         </el-form-item>
 						<el-form-item prop="cost">
 						    <span>框架总额</span>
@@ -81,7 +81,7 @@
 						    <span>合同编号</span>
 						    <el-input v-model="infolist.frameContractNo" placeholder="合同编号" :disabled="disableStatus"></el-input>
 						</el-form-item>
-						<el-form-item prop="contractSignTime">
+						<!-- <el-form-item prop="contractSignTime">
 						    <span>签订时间</span>
 						    <el-date-picker v-model="infolist.contractSignTime" type="datetime" placeholder="签订时间" :disabled="disableStatus">
 						    </el-date-picker>
@@ -90,13 +90,13 @@
 						    <span>截止时间</span>
 						    <el-date-picker v-model="infolist.contractEndTime" type="datetime" placeholder="截止时间" :disabled="disableStatus">
 						    </el-date-picker>
-						</el-form-item>
-                        <el-form-item prop="contractEndTime">
+						</el-form-item> -->
+                        <el-form-item >
 						    <span>预占总额</span>
 						    <el-input v-model="infolist.preCost"  placeholder="预占总额" :disabled="disableStatus">
 						    </el-input>
 						</el-form-item>
-                        <el-form-item prop="contractEndTime">
+                        <el-form-item >
 						    <span>下单总额</span>
 						    <el-input v-model="infolist.billCost"  placeholder="下单总额" :disabled="disableStatus">
 						    </el-input>

src/pages/main/provincialWorkOrder/provincialWorkOrderArea.vue

@@ -220,10 +220,9 @@ export default {
             },
             requestForm: {
                 // fresourceId: "a682dc9f-2fea-11ed-a6ed-02427ba2d388", // 本地环境
-                // fresourceId: "db26384e-b984-11ed-afb6-e00084564cce", // 生产环境
+                // fresourceId: "canvas", // 生产环境
                 // fresourceId: "33b0af93-b1ce-11ed-be6b-00505687dcd3", //测试91环境
-
-                fresourceId: getConfig().provincialWorkOrderAreafresourceId, 
+                fresourceId: getConfig().provincialWorkOrderAreafresourceId, //测试91环境
                 processDefinitionKey: "tygd_cit_process",
             },
             dialogStatus: false, //dialog显示

src/router/index.js

@@ -2292,6 +2292,13 @@ const routes = [{
             name: 'provincialWorkOrderArea',
             component: resolve => require(['../pages/main/provincialWorkOrder/provincialWorkOrderArea.vue'], resolve),
             meta: { title: '地市-通用工单' }
+        },
+        {
+            meta: { name: '备份数据恢复申请流程', keepAlive: false },
+            path: '/bfsjList',
+            name: 'bfsjList',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/bfsj/bfsjList.vue'], resolve)
         }