Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -8,13 +8,13 @@ module.exports = merge(prodEnv, {
 
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http://192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
-  BASE_URL: '"http:///192.168.0.253:8080/"',//田智
+  // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http://192.168.0.250:8080/"',//

src/http/moudules/task.js

@@ -1600,3 +1600,86 @@ export const rejectPage = (data) => {
     data
   })
 }
+
+
+
+export const selectProject = (data) => {
+  return axios({
+    url: "/task/project/selectProject",
+    method: "post",
+    data
+  })
+}
+
+export const removeProject = (data) => {
+  return axios({
+    url: "/task/project/removeProject",
+    method: "post",
+    data
+  })
+}
+
+export const updateProject = (data) => {
+  return axios({
+    url: "/task/project/updateProject",
+    method: "post",
+    data
+  })
+}
+
+export const addProject = (data) => {
+  return axios({
+    url: "/task/project/addProject",
+    method: "post",
+    data
+  })
+}
+
+export const getTaskPage = (data) => {
+  return axios({
+    url: "/task/task/getTaskPage",
+    method: "post",
+    data
+  })
+}
+
+
+export const delTask = (data) => {
+  return axios({
+    url: "/task/task/delTask",
+    method: "post",
+    data
+  })
+}
+
+export const addTask = (data) => {
+  return axios({
+    url: "/task/task/addTask",
+    method: "post",
+    data
+  })
+}
+
+export const editTask = (data) => {
+  return axios({
+    url: "/task/task/editTask",
+    method: "post",
+    data
+  })
+}
+
+export const getProjectList = (data) => {
+  return axios({
+    url: "/task/project/getProjectList",
+    method: "post",
+    data
+  })
+}
+
+export const fileUpload = (data) => {
+  return axios({
+    url: "/task/file/upload",
+    method: "post",
+    data
+  })
+}

src/views/FinancialManagement/AcountWithdrawal/AcountBalance.vue

@@ -12,7 +12,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item label="姓名">
-                <el-input clearable size="small" placeholder="姓名" v-model="pageRequest.userName"></el-input>
+                <el-input clearable size="small" placeholder="姓名" v-model="pageRequest.name"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="5">

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -511,8 +511,21 @@ export default {
             prop: "agreementName",
             label: "协议名称",
             type: "text"
-          },
-          {
+          },{
+            prop: "isExternal",
+            label: "外部订单",
+            type: "statMap",
+            options: [
+              {
+                label: '否',
+                value: '0'
+              },
+              {
+                label: '是',
+                value: '1'
+              },
+            ]
+          },{
             prop: "policyno",
             label: "交强保单号",
             type: "text"

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -494,6 +494,20 @@ export default {
             label: "协议名称",
             type: "text"
 
+          },{
+            prop: "isExternal",
+            label: "外部订单",
+            type: "statMap",
+            options: [
+              {
+                label: '否',
+                value: '0'
+              },
+              {
+                label: '是',
+                value: '1'
+              },
+            ]
           }, {
             prop: "policyno",
             label: "交强保单号",

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesDetail.vue

@@ -442,8 +442,21 @@ export default {
             prop: "agreementName",
             label: "协议名称",
             type: "text"
-          },
-          {
+          },{
+            prop: "isExternal",
+            label: "外部订单",
+            type: "statMap",
+            options: [
+              {
+                label: '否',
+                value: '0'
+              },
+              {
+                label: '是',
+                value: '1'
+              },
+            ]
+          },{
             prop: "noPolicyno",
             label: "非车保单号",
             type: "text"

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -499,8 +499,21 @@ export default {
             prop: "agreementName",
             label: "协议名称",
             type: "text"
-          },
-          {
+          },{
+            prop: "isExternal",
+            label: "外部订单",
+            type: "statMap",
+            options: [
+              {
+                label: '否',
+                value: '0'
+              },
+              {
+                label: '是',
+                value: '1'
+              },
+            ]
+          },{
             label: "非车保单号",
             prop: "noPolicyno",
             type: "text",

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -573,8 +573,21 @@ export default {
             prop: "agreementName",
             label: "协议名称",
             type: "text"
-          },
-          {
+          },{
+            prop: "isExternal",
+            label: "外部订单",
+            type: "statMap",
+            options: [
+              {
+                label: '否',
+                value: '0'
+              },
+              {
+                label: '是',
+                value: '1'
+              },
+            ]
+          },{
             prop: "policyno",
             label: "交强保单号",
             type: "text"

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyintasks.vue

@@ -303,6 +303,24 @@ export default {
           type: 'date',
           list: 'payList'
         },
+        {
+          name: 'isExternal',
+          label: '外部订单',
+          optionsIabel: 'label',
+          optionsValue: 'value',
+          Retained: true,
+          type: 'select',
+          options: [
+          {
+                label: '否',
+                value: '0'
+              },
+              {
+                label: '是',
+                value: '1'
+              },
+          ]
+        },
       ],
       orderInfo: {
         //选中的订单

src/views/Letter/Wallet/FundsWallet.vue

@@ -449,7 +449,7 @@ export default {
 .header {
   width: 100%;
   height: auto;
-  background: #F2F5FD;
+  background: #FDF2F2;
   border-radius: 12px 12px 12px 12px;
   padding: 20px;
   box-sizing: border-box;
@@ -504,8 +504,8 @@ export default {
 .withdrawal-style {
   width: 140px;
   color: #fff;
-  background: linear-gradient(270deg, #0052FF 0%, #6899FF 100%);
-  border-color: #6899FF;
+  background: linear-gradient( 90deg, #F34747 0%, #DF3739 100%);
+  border-color: #DF3739;
   margin-left: 30px;
 }