更新

src/views/login/index.vue

@@ -446,10 +446,9 @@ $back: #333;
   }
   .el-form-item {
     border: 1px solid rgba(255, 255, 255, 0.1);
-    // background: rgba(0, 0, 0, 0.1);
     border-radius: 5px;
     color: #454545;
-    margin-bottom: 10px;
+    margin-bottom: 25px !important;
   }
 
   .el-checkbox__input {

src/views/login/index2.vue

@@ -319,10 +319,10 @@ $back: #333;
 
   .el-form-item {
     border: 1px solid rgba(255, 255, 255, 0.1);
-    // background: rgba(0, 0, 0, 0.1);
+
     border-radius: 5px;
     color: #454545;
-    margin-bottom: 10px;
+    margin-bottom: 25px !important ;
   }
 
   .el-checkbox {

src/views/sales_policy/components/AddCondition.vue

@@ -216,6 +216,16 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :xs="24" :sm="8" :lg="8" :offset="0">
+                <el-form-item label="">
+                  <el-button
+                    type="primary"
+                    size="small"
+                    @click="getMaterialLists(arrIndex)"
+                    >搜索</el-button
+                  >
+                </el-form-item>
+              </el-col>
             </el-form>
           </el-header>
           <el-main height="">
@@ -390,7 +400,6 @@
 
 <script>
 import {
-  getId,
   addPoliyCondition,
   getConditionMaterialList,
   getMaterialList,
@@ -631,25 +640,25 @@ export default {
          */
         if (this.newConditionBox.length) {
           this.conditList = res.data.records;
-            if (this.conditionBox[index].length) {
-                for (let n = 0; n < this.newConditionBox.length; n++) {
-                  for (let m = 0; m < this.newConditionBox[n].length; m++) {
-                      if (m ==index) {
-                        this.$set(this.newConditionBox[n],m,[...this.conditionBox[index],...this.newConditionBox[n][m]])
-                        console.log(this.newConditionBox,'newenewnwn');
-                      }
-                  }
-
+          if (this.conditionBox[index].length) {
+            for (let n = 0; n < this.newConditionBox.length; n++) {
+              for (let m = 0; m < this.newConditionBox[n].length; m++) {
+                if (m == index) {
+                  this.$set(this.newConditionBox[n], m, [
+                    ...this.conditionBox[index],
+                    ...this.newConditionBox[n][m],
+                  ]);
+                  console.log(this.newConditionBox, "newenewnwn");
+                }
               }
-
             }
+          }
 
           for (let j = 0; j < this.newConditionBox.length; j++) {
             for (let o = 0; o < this.newConditionBox[j].length; o++) {
               if (o == index) {
                 for (let i = 0; i < res.data.records.length; i++) {
                   for (let k = 0; k < this.newConditionBox[j][o].length; k++) {
-
                     if (
                       this.newConditionBox[j][o][k].id == res.data.records[i].id
                     ) {

src/views/sales_policy/components/AddPolicy.vue

@@ -568,7 +568,7 @@ export default {
           title: "",
           type: "",
           ...this.searchForm,
-          imgSrc: this.fileList[0].url || "",
+          imgSrc: this.fileList.length ? this.fileList[0].url : ""
         };
         console.log(this.fileList);
         addPoliy(params).then((res) => {

src/views/sales_policy/policy_list.vue

@@ -161,15 +161,19 @@
     </div>
     <div class="mymain-container">
       <el-table :data="dataList" border style="width: 100%">
-        <el-table-column fixed="left" label="操作" min-width="150" align="center">
+        <el-table-column
+          fixed="left"
+          label="操作"
+          min-width="150"
+          align="center"
+        >
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
-              v-if=" scope.row.examineStatus == 'SAVE'"
+              v-if="scope.row.examineStatus == 'SAVE'"
               @click="(isShow = 5), (id = scope.row.id)"
               >编辑</el-button
-
             >
             <el-button
               type="text"
@@ -390,19 +394,15 @@ export default {
   computed: mapState({
     comCode: (state) => state.sales.code,
   }),
-  watch: {},
-  created() {},
   methods: {
     hanlenewInfo() {
       console.log();
-       getId().then(res=>{
-         this.$store.commit("sales/setId",res.data);
-          this.isShow = 2;
-      })
-
+      getId().then((res) => {
+        this.$store.commit("sales/setId", res.data);
+        this.isShow = 2;
+      });
     },
     getList() {
-
       this.listLoading = true;
       const params = {
         pageNum: this.currentPage,
@@ -421,7 +421,6 @@ export default {
         status: this.screenForm.status,
         title: this.screenForm.title,
       };
-      console.log(params, 123);
       getList(params).then((res) => {
         this.dataList = res.data.records;
         console.log(this.dataList);
@@ -484,12 +483,6 @@ export default {
         this.$successMsg("已提交");
         this.getList();
       });
-
-      // if (e.examineStatus == "SAVE") {
-
-      // } else {
-      //   this.$errorMsg("未满足条件");
-      // }
     },
     hanleExamine(e) {
       if (e.examineStatus == "WAIT") {