xx

src/components/FirstJob/detail.vue

@@ -313,7 +313,7 @@
           <div class="pay" id="tip" v-show="tabchange === 1">
             <div class="mb12 mt20 titlestyle">温馨提示</div>
             <div class="showInfo" style="width: unset">
-              {{ jobDetail.sweetTips || "-" }}
+              {{ jobDetail.notes || "-" }}
             </div>
           </div>
           <div v-if="tabchange === 1" style="display: flex">

src/components/FirstJob/recordBill.vue

@@ -418,14 +418,16 @@
           :labelCol="{ span: 4 }"
         >
           <!-- <a-input v-model="form.policy" type='textarea'/> -->
-          <div class="policy" style="">{{ form.policy }}</div>
+          <div class="policy" style="min-height: 30px !important">
+            {{ form.policy }}
+          </div>
           <div class="openContral" v-if="isContainerShow">
             <span v-if="isFold" @click="toFold(1)">展开</span
             ><span v-else @click="toFold(2)">收起</span>
           </div>
         </a-form-model-item>
         <a-form-model-item
-          ref="peoplecard"
+          ref="headerUploadRef"
           label="附件"
           prop="peoplecard"
           :wrapperCol="{ span: 18 }"
@@ -438,6 +440,11 @@
             :default-file-list="fileList2"
             class="upload-list-inline"
             @change="handleChange2"
+            :remove="
+              (file) => {
+                removeFile(file, 'header');
+              }
+            "
             @preview="handlePreview"
             :beforeUpload="beforeUpload"
             :data="dataObj"
@@ -517,24 +524,8 @@ export default {
   // 组件状态值
   data() {
     return {
-      fileList2: [
+      fileList2: [],
-        {
+      fileListT2: [],
-          uid: "-1",
-          name: "xxx.png",
-          status: "done",
-          url: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png",
-          thumbUrl:
-            "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png",
-        },
-        {
-          uid: "-2",
-          name: "yyy.png",
-          status: "done",
-          url: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png",
-          thumbUrl:
-            "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png",
-        },
-      ],
       // facetimedate: "",
       previewVisible: false,
       proxyStatus: "", // 代理选择的控制
@@ -650,6 +641,7 @@ export default {
         interviewTime: "", // 面试时间
         receptionTime: "", //接待时间
         idCardImageUrl: "",
+        imgs: "",
       },
       proxyinfo: {},
 
@@ -757,6 +749,9 @@ export default {
       );
     },
     handleOk() {
+      var that = this;
+      console.log(that.fileListT2);
+
       this.$refs.ruleForm.validate(async (ispass, no) => {
         console.log(this.form);
         console.log(ispass);
@@ -765,6 +760,8 @@ export default {
 
         if (ispass) {
           console.log(this.form);
+          this.form["imgs"] = that.fileListT2.toString();
+
           const { data } = await recordBillApi({
             ...this.form,
             storeJobId: this.firminfo.id,
@@ -851,7 +848,8 @@ export default {
       console.log(fileList[0]);
       this.fileList = fileList;
     },
-    handleChange2({ fileList }) {
+    handleChange2({ file, fileList }) {
+      console.log(file);
       console.log(fileList);
       this.fileList2 = fileList;
     },
@@ -1007,6 +1005,7 @@ export default {
 
     async customRequestFun2(file) {
       console.dir(file.onSuccess);
+      var that = this;
 
       let _self = this;
       var formData = new FormData();
@@ -1033,25 +1032,21 @@ export default {
 
       $.ajax({
         type: "post",
-        url: "/imgs/uploadImage",
+        url: "http://matripe-cms.oss-cn-beijing.aliyuncs.com",
         data: formData,
         contentType: false, // 不设置Content-Type请求头
         processData: false,
         success: function (data) {
-          console.log(data);
-
           file.onSuccess();
 
           console.log(document.querySelector(".ant-upload-list-item-info"));
 
-          _self.uploadFileFlag = true;
           console.log(data);
           var img =
             _self.dataObj.host +
             "/" +
             _self.dataObj.key.replace("${filename}", file.file.name);
-          _self.form.idCardImageUrl = img;
+          that.fileListT2.push(img);
-          console.log(_self.form.idCardImageUrl);
         },
         fail: function (err) {
           console.log(err);
@@ -1059,6 +1054,24 @@ export default {
       });
     },
 
+    removeFile(file) {
+      // let fileList
+      // let _this = this
+      // fileList = this.$refs.headerUploadRef.$children[1].$children[0].items
+
+      // console.log(this.$refs.headerUploadRef.$children[1].$children[0].items);
+      console.log(this.fileList2.indexOf(file));
+      let index = this.fileList2.indexOf(file);
+      this.fileListT2.splice(index, 1);
+
+      console.log(this.fileListT2);
+      // fileList.forEach((item, index) => {
+      //     if (item.uid === file.uid) {
+      //         _this.headerFileList.splice(index, 1)
+      //     }
+      // })
+    },
+
     async handlePreview(file) {
       console.log(file);
       if (!file.url && !file.preview) {
@@ -1184,6 +1197,10 @@ export default {
 };
 </script>
 <style scoped lang="less">
+/deep/ .policy {
+  min-height: 0 !important;
+}
+
 /deep/ .upload-list-inline .ant-upload-list-item {
   float: left;
   width: 220px;

src/utils/request.js

@@ -3,7 +3,8 @@ import router from "@/router";
 import Cookies from "js-cookie";
 // import Vue from "vue";
 // const baseURL = "http://1shoudan.com"; // 正式环境线上
-const baseURL = "http://idaotian.com"; // 正式环境线上
+// const baseURL = "http://idaotian.com"; // 正式环境线上
+const baseURL = "http://idagou.cn"; // 正式环境线上
 console.log(baseURL);
 // const baseURL = "https://d.matripe.com.cn"; // 正式环境本地
 // const baseURL = "http://bl7.matripe.com.cn:8001"; // 测试环境本地
@@ -14,8 +15,8 @@ console.log(baseURL);
 axios.defaults.withCredentials = true; //添加这行代码
 // console.log(axios);
 const service = axios.create({
-  baseURL: "/api_prod", // url = base url + request url  测试
+  // baseURL: "/api_prod", // url = base url + request url  测试
-  // baseURL: baseURL, //  baseURL: "/api", // url = base url + request url 正式
+  baseURL: baseURL, //  baseURL: "/api", // url = base url + request url 正式
   withCredentials: true, // send cookies when cross-domain requests
   timeout: 60000, // request timeout
   crossDomain: true,