Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -72,7 +72,9 @@ export default {
     },
       render: {
       handler(newValue, oldValue) {
+            if(newValue){
           this.loadData();
+            }
       },
     },
     immediate: true,

@@ -100,38 +100,30 @@
           },
           {
             prop: "sjsl",
-            label: "份数",
-            width: "50",
+            label: "收件数量",
+            width: "80",
             render: (h, scope) => {
               return (
                 (this.formData.ableOperation && scope.row.isrequired != '1') ?
                   <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{
-                    scope.row.sjsl ?
-                      <span>{scope.row.sjsl}</span> : 1
+                    scope.row.sjsl
                   }</span>
               )
             }
           },
           {
             prop: "smzt",
-            label: "扫描状态",
+            label: "扫描时间",
             width: "80",
             render: (h, scope) => {
-              if (scope.row.children && scope.row.children.length > 0) {
-                return (
-                  <div>
-                    <span>已扫描</span>
-                  </div>
-                );
-              } else {
               return (
-                  <div>
-                    <span>未扫描</span>
-                  </div>
-                );
+                (this.formData.ableOperation && scope.row.isrequired != '1') ?
+                  <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{
+                    scope.row.sjsj
+                  }</span>
+              )
             }
           },
-          },
           {
             label: "扫描页数",
             width: "80",