safecheck-client 4.0.1-8 → 4.0.1-80

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "common-intellisense.translate": false
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.1-8",
+  "version": "4.0.1-80",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",
@@ -31,9 +31,9 @@
     "benz-amr-recorder": "^1.1.3",
     "browserslist": "^4.21.4",
     "crypto-js": "^4.2.0",
-    "html2canvas": "^1.1.4",
-    "html2pdf.js": "^0.10.1",
-    "jspdf": "^2.3.1",
+    "html2canvas": "1.1.4",
+    "html2pdf.js": "0.10.1",
+    "jspdf": "2.3.1",
     "less": "^4.2.0",
     "mint-ui": "^1.0.2",
     "node-libs-browser": "^2.2.1",
@@ -108,7 +108,7 @@
     "terser-webpack-plugin-legacy": "^1.2.5",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.25.30",
+    "vue-client": "1.25.41",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/NewDefectList/DefectListNew.vue

@@ -56,10 +56,9 @@
             </td>
             <td style="text-align: center">
               <div>
-                <!--                <img-button v-if="row.f_repaire_type != '无隐患' && row.f_repaire_type != '维修已处理' && row.f_path" :src="'/rs/image/file/'+row.f_path" :value="'隐患图片'"></img-button>-->
-                <!--                <button style="margin-top: 3px" v-if="row.f_repaire_type == '维修已处理'" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect( row, 'view')">处理详情</button>-->
                 <button style="margin-top: 3px" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect(row, row.f_repaire_type)">处理详情</button>
                 <button style="margin-top: 3px" v-if="row.f_repaire_type == '隐患未处理' && $parent.$parent.$parent.showHandleDefectButton === '是'" class="button_spacing button_search-1" @click="$parent.$parent.$parent.solveDefect(row, 'solve')">处理隐患</button>
+                <button style="margin-top: 3px" v-if="$parent.$parent.$parent.canlook" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.lookMateril(row)">查看材料</button>
               </div>
             </td>
           </template>
@@ -236,7 +235,16 @@
         <button class="button_search" @click="cancel">取消</button>
       </div>
     </modal>
-
+    <modal :show.sync="showmaterial"  backdrop="false" style="overflow: scroll;height: 100%">
+      <header slot="modal-header" class="modal-header text-center">
+        <button type="button" class="close" @click="close2"><span>&times;</span></button>
+        <h4 class="modal-title">材料查看</h4>
+      </header>
+      <article slot="modal-body">
+        <defect-material-look v-if="showmaterial"  :selectdata = "selectdata" ></defect-material-look>
+      </article>
+      <footer slot="modal-footer"></footer>
+    </modal>
   </div>
 </template>
 
@@ -388,6 +396,8 @@ export default {
       valid: false,
       checkDefect:null,
       needRepair: false,
+      showmaterial: false,
+      selectdata: {},
       solveModal: {
         preData: {
           type: '',
@@ -470,6 +480,7 @@ export default {
           callObj: null
         }
       },
+      canlook: this.$appdata.getSingleValue('隐患明细查看材料')?true:false,
       showHandleDefectButton: null
     }
   },
@@ -485,6 +496,14 @@ export default {
     this.getEmp()
   },
   methods: {
+    lookMateril(row){
+      this.selectdata=row
+      this.selectdata.f_defect_id=row.id
+      this.showmaterial=true
+    },
+    close2(){
+      this.showmaterial=false
+    },
     getfile(res){
       this.solveModal.uploadData.filename=res.f_filename
     },

package/src/components/Util/RightTreeSafeDep.vue

@@ -156,6 +156,18 @@ export default {
     }
   },
   methods: {
+    clear(){
+      //取消点击
+      this.orgnames="请选择"
+      this.orgids=null
+      this.orgobj=null
+      let newobj={
+        "res": [],
+        "resids": [],
+        "orgobj": [],
+      }
+      this.$emit('re-res', newobj)
+    },
     selectRes () {
       let newobj={
         "res": [this.resname],