Merge branch 'sit' of daiyanrong/accout-ui into master

src/views/search/standBook/addEdit.vue

@@ -98,24 +98,7 @@ export default {
       }
     };
     return {
-      options: [
-        {
-          value: "1",
-          label: "回票明细报表",
-        },
-        {
-          value: "2",
-          label: "回票公司订单明细报表",
-        },
-        {
-          value: "3",
-          label: "库存出入库明细报表",
-        },
-        {
-          value: "4",
-          label: "收入成本明细报表",
-        },
-      ],
+      options: [],
       loading: false,
       title: "添加账号",
       showModelThis: this.showModel,
@@ -162,6 +145,7 @@ export default {
     },
     async initForm() {
       this.loading = true;
+      this.options = [];
       this.rulesThis = this.rules;
       await this.resetForm();
       this.loading = false;
@@ -184,11 +168,17 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { start, end, id } = this.sitem;
-          console.log(this.sitem);
+          const { start, end, id, name } = this.sitem;
+          // console.log(this.sitem);
+          this.options = [
+            {
+              value: id,
+              label: name,
+            },
+          ];
           this.ruleForm = {
-            start:  "",
-            end:  "",
+            start: "",
+            end: "",
             id: id || "",
           };
           console.log(this.ruleForm);

src/views/search/standBook/pre-export.vue

@@ -41,7 +41,7 @@
           <template slot-scope="scope">
                <el-tag
           :size="tablebtnSize"
-          :type="scope.row.status == '1' ? 'warning' : 'success'"
+          :type="scope.row.status == '2' ? 'success' : scope.row.status == '1'?'warning':'info'"
           v-text="
             (statusOptions.find((item) => item.id == scope.row.status) || {})
               .label || '--'
@@ -117,6 +117,7 @@ export default {
       fileUrl: urlConfig.baseURL,
       // 状态
       statusOptions: [
+        { id: "0", label: "待创建" },
         { id: "1", label: "待执行" },
         { id: "2", label: "已完成" },
       ],