init

src/components/tableList.vue

@@ -207,7 +207,11 @@
                 (scope.row['goodsType'] === 1 || scope.row['goodsType'] === 2)
               "
               style="color: blue"
-              @click="scope.row['goodsType'] === 1 ? diavios(scope.row['goodsId']) : diaviosTK(scope.row['goodsId'])"
+              @click="
+                scope.row['goodsType'] === 1
+                  ? diavios(scope.row['goodsId'])
+                  : diaviosTK(scope.row['goodsId'])
+              "
               >结构树视图</span
             >
             <span v-else-if="item.scope === 'leftCh'">
@@ -914,18 +918,13 @@
                   : ""
               }}
             </span>
-            <span
-              v-else-if="item.scope === 'changeCLS'"
-              :style="scope.row[item.prop] === 1 ? 'color:red' : ''"
-            >
-              {{
-                scope.row[item.prop] === 0
-                  ? "正常"
-                  : scope.row[item.prop] === 1
-                  ? "有变更"
-                  : ""
-              }}
-            </span>
+            <div v-else-if="item.scope === 'changeCLS'">
+              <div v-if="scope.row[item.prop] === 1" style="color: red">
+                有变更
+                <span style="marign-left:6px;color:blue;cursor: pointer;" @click="isShowBoxsFun(scope.row)">查看</span>
+              </div>
+              <span v-else> 正常 </span>
+            </div>
             <span
               v-else-if="item.scope === 'finishStatus'"
               :style="scope.row[item.prop] === 0 ? 'color:red' : ''"
@@ -1171,7 +1170,9 @@
                   :key="indext"
                   v-if="itemt.value === scope.row[item.prop]"
                   :style="itemt.style ? itemt.style : ''"
-                  >{{scope.row['subscribeStatus'] === 1 ? itemt.label:'' }}</span
+                  >{{
+                    scope.row["subscribeStatus"] === 1 ? itemt.label : ""
+                  }}</span
                 >
               </template>
             </div>
@@ -1328,6 +1329,35 @@
         <el-button @click="diaviosOpen = false">取 消</el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      :visible.sync="isShowBoxs"
+      width="400px"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <div slot="title" class="hearders">
+        <div class="leftTitle">资料变更详情</div>
+        <div class="rightBoxs">
+          <img
+            src="@/assets/images/Close@2x.png"
+            alt=""
+            @click="isShowBoxs = false"
+          />
+        </div>
+      </div>
+      <div>
+        <ul>
+          <li v-for="(items,indexs) in listBoxsGET" :key="indexs" style="margin-bottom:30px;">
+            <p>{{$methodsTools.onlyForma(items.updateTime)}}</p>
+            <p style="padding-left:14px;color:#999;">姓名：{{items.realname}}</p>
+            <p style="padding-left:14px;color:#999;">身份证号码：{{items.idCard}}</p>
+          </li>
+        </ul>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="isShowBoxs = false">取 消</el-button>
+      </span>
+    </el-dialog>
     <el-dialog
       :visible.sync="diaviosTKOpen"
       width="560px"
@@ -1365,7 +1395,7 @@ export default {
   data: function () {
     return {
       diaviosOpen: false,
-      diaviosTKOpen:false,
+      diaviosTKOpen: false,
       dialogVisible: false,
       tableSet: this.tableSets,
       allCheckData: [], //表格多选
@@ -1375,6 +1405,8 @@ export default {
       isIndeterminate: false,
       videoUrls: "",
       diaBox: false,
+      isShowBoxs:false,
+      listBoxsGET:[],
       props: {
         label(data, node) {
           return data.menuName || data.name;
@@ -1435,6 +1467,13 @@ export default {
   },
   mounted() {},
   methods: {
+    isShowBoxsFun(item){
+      this.$api.inquireuserUpdateListsy({userId:item.userId}).then(res => {
+        this.listBoxsGET = res.rows
+        this.isShowBoxs = true
+        this.$api.editgradestudentuserUpdate({userId:item.userId,status:1}).then(result => {})
+      })
+    },
     sortMethods(a, b) {
       return a.classGradeUserGoodsVoList.length >
         b.classGradeUserGoodsVoList.length
@@ -1580,15 +1619,15 @@ export default {
       }
     },
     diavios(ids) {
-        this.$api.obtainCourseSgoodsId(ids).then((res) => {
-          res.rows.forEach((item) => {
-            item.TypeId = "0-" + item.courseId;
-            item.type = 0;
-            item.hasChildren = true;
-          });
-          this.treeDatas1 = res.rows;
-          this.diaviosOpen = true;
+      this.$api.obtainCourseSgoodsId(ids).then((res) => {
+        res.rows.forEach((item) => {
+          item.TypeId = "0-" + item.courseId;
+          item.type = 0;
+          item.hasChildren = true;
         });
+        this.treeDatas1 = res.rows;
+        this.diaviosOpen = true;
+      });
     },
     loadNode1(node, resolve) {
       if (node.level === 0) {
@@ -1636,14 +1675,14 @@ export default {
       }
     },
     diaviosTK(ids) {
-        this.$api.inquireGoodsbanklist({ goodsId: ids }).then((res) => {
-          res.data.forEach((item) => {
-            item.TypeId = item.type + "-" + item.majorId;
-            item.hasChildren = item.type === 3 ? false:true;
-          });
-          this.treeDatas2 = res.data;
-          this.diaviosTKOpen = true;
+      this.$api.inquireGoodsbanklist({ goodsId: ids }).then((res) => {
+        res.data.forEach((item) => {
+          item.TypeId = item.type + "-" + item.majorId;
+          item.hasChildren = item.type === 3 ? false : true;
         });
+        this.treeDatas2 = res.data;
+        this.diaviosTKOpen = true;
+      });
     },
     loadNode2(node, resolve) {
       if (node.level === 0) {

src/newApi/studentList.js

@@ -56,5 +56,20 @@ export default {
             params: data
         })
     },
-    
+    //修改用户修改记录
+    editgradestudentuserUpdate(data) {
+        return request({
+            url: '/grade/student/userUpdate',
+            method: 'post',
+            data
+        })
+    },
+    // 查询用户修改记录列表
+    inquireuserUpdateListsy(data) {
+        return request({
+            url: '/grade/student/userUpdateList',
+            method: 'get',
+            params: data
+        })
+    },
 }

src/utils/request.js

@@ -7,7 +7,7 @@ import methods from '@/utils/methodsTool';
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
-export const baseURL = 'http://192.168.1.12:5030/'
+export const baseURL = 'http://192.168.1.222:5030/'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: 'http://192.168.1.24:5030/',

src/views/Marketing/commodityManageMent/add/index.vue

@@ -600,6 +600,7 @@
           </el-col>
         </el-row>
       </div>
+      <div v-if="listData.goodsType === 1 || listData.goodsType === 2">
       <h5
         class="fengs"
         v-if="listData.goodsType === 1 || listData.goodsType === 2"
@@ -637,6 +638,7 @@
           <div style="clear: both"></div>
         </ul>
       </div>
+      </div>
     </div>
     <h5>商品包装介绍</h5>
     <div class="boxsSTTs">

src/views/Marketing/commodityManageMent/edit/index.vue

@@ -603,6 +603,7 @@
           </el-col>
         </el-row>
       </div>
+      <div v-if="listData.goodsType === 1 || listData.goodsType === 2">
       <h5
         class="fengs"
         v-if="listData.goodsType === 1 || listData.goodsType === 2"
@@ -640,6 +641,7 @@
           <div style="clear: both"></div>
         </ul>
       </div>
+      </div>
     </div>
     <h5>商品包装介绍</h5>
     <div class="boxsSTTs">

src/views/education/examManagement/applicationData/asPlanned.vue

@@ -309,6 +309,7 @@
             style="display: none"
             type="file"
             id="mobles"
+            ref="input1"
             @change="importMobleadd"
           />
           <p>
@@ -323,6 +324,7 @@
             style="display: none"
             type="file"
             id="moblest"
+            ref="input2"
             @change="importMobleEdit"
           />
         </div>
@@ -608,7 +610,7 @@ export default {
   },
   methods: {
     getDowm() {
-      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20211215.xls";
+      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20211228.xls";
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);
@@ -623,6 +625,7 @@ export default {
       let formData = new FormData();
       formData.append("file", file);
       this.$api.editsystemimportDatae(formData).then((res) => {
+        e.target.value = ''
         if (res.msg) {
           let url = baseUrlst.baseURL + "common/download?fileName=" + res.msg;
           let link = document.createElement("a");
@@ -645,6 +648,7 @@ export default {
       let formData = new FormData();
       formData.append("file", file);
       this.$api.editsystemimportUpdateData(formData).then((res) => {
+        e.target.value = ''
         if (res.msg) {
           let url =
             "http://192.168.1.12:5030/common/download?fileName=" + res.msg;

src/views/education/notificationManageMent/notificationList/add/index.vue

@@ -123,7 +123,7 @@
                   ><span>第{{ item.topicNum }}分钟</span>
                 </div>
                 <div>
-                  <el-button type="text">预览</el-button>
+                  <!-- <el-button type="text">预览</el-button> -->
                   <el-button type="text" @click="delCourse(index)"
                     >删除</el-button
                   >
@@ -538,6 +538,12 @@ export default {
     filterText(val) {
       this.$refs.tree.filter(val);
     },
+    filterTextTwo(val) {
+      this.$refs.tree1.filter(val);
+    },
+    filterTextThree(val) {
+      this.$refs.tree2.filter(val);
+    },
     "informCourseAdd.educationId"(v) {
       this.informCourseAdd = {
         educationId: v,
@@ -941,6 +947,13 @@ export default {
             this.$message.error("请选择收件人");
             return;
           }
+          if(this.listData.issueStatus === 2){
+            var timestamp=new Date().getTime()
+            if(timestamp >= this.listData.issueTime){
+              this.$message.warning("发布时间不得小于当前时间，请重新选择")
+              return
+            }
+          }
           // if (!this.listData.informCourseAddBo.length &&!this.listData.informExamAddBo.length) {
           //   this.$message.error("请添加课程题库");
           //   return;