element2.8.2 -- 准入方式，除一级二级外其他需要考察报告

src/dashoo.cn/frontend_web/package.json

@@ -22,7 +22,7 @@
     "chart.js": "^2.7.0",
     "cross-env": "^5.1.1",
     "echarts": "^3.8.5",
-    "element-ui": "^2.13.2",
+    "element-ui": "2.8.2",
     "es6-promise": "^4.1.1",
     "file-saver": "^2.0.1",
     "highcharts": "^5.0.15",

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -710,7 +710,8 @@
     </el-card>
     <!--打印内容结束-->
     <!--endprint1-->
-    <el-card v-if="(isInvestigate) && (formData.InStyle != '2')">
+    <!-- && (formData.InStyle != '2') -->
+    <el-card v-if="isInvestigate">
       <el-row>
         <el-col :span="24">
           <span>现场考察报告</span>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -878,6 +878,16 @@ export default {
       // }
     },
     nextStep () {
+      if (this.formDataCert.InStyle != '2' && this.formDataCert.InStyle != '3' ) {
+        // 准入方式，除一级二级外其他需要考察报告
+        if (this.$refs['GoodsInfo'].scenefileurllist.length <= 0) {
+          this.$message({
+            type: 'warning',
+            message: '请上传现场考察报告！'
+          })
+          return false
+        }
+      }
       this.$refs['subfileList'].nextStep()
     },
     annaudit () {
@@ -1323,9 +1333,17 @@ export default {
       let valid = true
       if (this.formDataCert.Status <= 0 && this.activeName === '0') {
         valid = this.saveEntity()
+        if (this.formDataCert.InStyle != '2' && this.formDataCert.InStyle != '3' ) {
+          // 准入方式，除一级二级外其他需要考察报告
+          if (this.$refs['GoodsInfo'].scenefileurllist.length <= 0) {
+            this.$message({
+              type: 'warning',
+              message: '请上传现场考察报告！'
+            })
+            return false
+          }
+        }
       } else if (this.formDataCert.Status <= 0 && this.activeName === '1') {
-        // valid = this.updateNumberEntity()
-        // valid = true// 没办法中的办法
         if (this.formDataCert.WorkerTotal <= 0) {
           this.$message({
             type: 'warning',

src/dashoo.cn/frontend_web/yarn.lock

@@ -2653,10 +2653,10 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.214.tgz#8b5b9a0415fd41b69c61f694007597cb8c8eb7e8"
   integrity sha512-SU9yyql6uA0Fc8bWR7sCYNGBtxkC+tQb6UaC7ReaadN42Kx7Ka+dzx3lAIm9Ock+ULEawJuTFcVB2x34uOCg0Q==
 
-element-ui@^2.13.2:
-  version "2.13.2"
-  resolved "https://registry.npm.taobao.org/element-ui/download/element-ui-2.13.2.tgz?cache=0&sync_timestamp=1589795164194&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felement-ui%2Fdownload%2Felement-ui-2.13.2.tgz#582bf47aaaaaafe23ea1958fae217a687ad06447"
-  integrity sha1-WCv0eqqqr+I+oZWPriF6aHrQZEc=
+element-ui@2.8.2:
+  version "2.8.2"
+  resolved "https://registry.npm.taobao.org/element-ui/download/element-ui-2.8.2.tgz?cache=0&sync_timestamp=1589795164194&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felement-ui%2Fdownload%2Felement-ui-2.8.2.tgz#21a7a4cb92616b0f8b75d4d4e637d3a1cd8c09de"
+  integrity sha1-Iaeky5Jhaw+LddTU5jfToc2MCd4=
   dependencies:
     async-validator "~1.8.1"
     babel-helper-vue-jsx-merge-props "^2.0.0"