Skip to content

F
founder_vue
Commit a58f3c03 by liyuhang19990520
Options

Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

parents 6c3ddaf2 665420de
Showing with 120 additions and 101 deletions
package-lock.json
......@@ -1825,37 +1825,6 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": {
"version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
......@@ -1865,35 +1834,11 @@
"ms": "2.1.2"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
"integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -12211,6 +12156,63 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
"integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
src/components/form.vue
......@@ -124,6 +124,7 @@
</div>
<!--文本域-->
<el-input
style="height: 117px;"
type="textarea"
:autosize="autosize"
:rows="item.rows ? item.rows : 10"
......@@ -1266,11 +1267,11 @@ export default {
debugger
if(index == 'label'){
params.append(
itemData.objStr + "." + jsrXm,
itemData.objStr + "." + 'jsrXm',
arr[0][index])
}else if(index == 'value'){
params.append(
itemData.objStr + "." + jsrZjhm,
itemData.objStr + "." + 'jsrZjhm',
arr[0][index])
}else{
params.append(
......@@ -1839,7 +1840,7 @@ $-header-fontSize: 18px;
.el-form-item__content {
font-size: 13px;
line-height: 36px;
height: 36px;
// height: 36px;
.el-form-item__error {
padding-top: 0px;
}
......
src/utils/http.js
......@@ -3,10 +3,24 @@ import axios from "axios";
import { Message, MessageBox } from "element-ui";
import qs from "qs";
var arr = document.cookie.split("; ");
let userToken = "";
let appToken = "";
arr.forEach((item) => {
if (item.includes("userToken")) {
userToken = item.split("userToken")[1];
}
if (item.includes("appToken")) {
appToken = item.split("appToken")[1];
}
});
debugger
axios.defaults.timeout = 0;
axios.defaults.headers = {
"X-Requested-With": "XMLHttpRequest",
"authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
"authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
"token": userToken,
"appToken": appToken,
};
axios.defaults.responseType = "json";
// axios.defaults.withCredentials = true;
......@@ -14,14 +28,18 @@ axios.defaults.responseType = "json";
var instance = axios.create({
headers: {
"content-type": "multipart/form-data",
"authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
"authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
"token": userToken,
"appToken": appToken,
}
});
var json = axios.create({
headers: {
"content-type": "application/json",
"authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0"
"authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
"token": userToken,
"appToken": appToken,
}
});
......@@ -39,7 +57,6 @@ axios.interceptors.request.use(
config.headers["Content-Type"] = "application/x-www-form-urlencoded";
let token = sessionStorage.getItem("token")
if (config.url.indexOf("/api/blade-auth/token") === -1) {
config.headers["blade-auth"] = token;
}
......
src/views/xsjsdb/addRwbd.vue
......@@ -30,26 +30,6 @@ export default {
index: 0,
data: [
{
name: "任务名称:",
id: "rwmc",
type: "text",
prop: "checkEmpty",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "任务类型:",
id: "rwlxdm",
type: "codeTree",
prop: "checkEmpty",
value: "",
placeholder: "请选择",
col: "2",
codeOptions: [],
codeTree: "CODE_XSJSBD_RWLXDM",
},
{
name: "案件编号:",
id: "asjbh",
type: "textTq",
......@@ -88,9 +68,25 @@ export default {
codeOptions: [],
codeTree: "CODE_AJLB",
},
{
col: "2",
},
{
name: "简要案情:",
id: "jyaq",
type: "textarea",
prop: "checkEmpty",
value: "",
placeholder: "请输入",
col: "3",
},
{
col: "2",
},
{
name: "任务名称:",
id: "rwmc",
type: "text",
prop: "checkEmpty",
value: "",
......@@ -98,12 +94,23 @@ export default {
col: "2",
},
{
name: "任务类型:",
id: "rwlxdm",
type: "codeTree",
prop: "checkEmpty",
value: "",
placeholder: "请选择",
col: "2",
codeOptions: [],
codeTree: "CODE_XSJSBD_RWLXDM",
},
{
name: "任务描述:",
id: "rwxq",
type: "text",
type: "textarea",
value: "",
placeholder: "请输入",
col: "2",
col: "3",
},
{
name: "接收人姓名:",
......@@ -120,7 +127,7 @@ export default {
type: "file",
value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "11",
col: "1",
acceptType: "image/jpeg,image/gif,image/png",
},
{
......@@ -129,7 +136,7 @@ export default {
type: "file",
value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "11",
col: "1",
acceptType: "image/jpeg,image/gif,image/png",
},
],
......@@ -168,13 +175,6 @@ export default {
self.propFormField[0].data.forEach((fieldItem) => {
//遍历配置文件，拿到数据返回来的xs实体。
var fieldVale;
// if (entityName) {
// if (result[entityName] && fieldItem.id) {
// fieldVale = result[entityName][fieldItem.id];
// } else {
// fieldVale = result[fieldItem.id];
// }
// }
if (fieldItem.type == "file") {
self.$set(self.formLabelAlign, fieldItem.id, []);
if (result[fieldItem.id]) {
......@@ -210,14 +210,13 @@ export default {
addBdrw(params)
.then((res) => {
debugger;
// this.$message.success("保存成功");
this.$alert("保存成功!", "提示", {
confirmButtonText: "确定",
type: "success",
// callback: () => {
// this.$router.push("hmxsGl");
// loading.close();
// },
callback: () => {
this.$router.push("queryRwbd");
loading.close();
},
});
})
.catch((res) => {
......@@ -245,11 +244,11 @@ export default {
arr.push({
label: item.trueName,
value: item.identitycard,
unitname: item.unitname,
unitcode: item.unitcode,
jsrDwmc: item.unitname,
jsrDwdm: item.unitcode,
});
});
self.$set(self.propFormField[0].data[8], "codeOptions", arr);
self.$set(self.propFormField[0].data[4], "codeOptions", arr);
});
},
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment