002201 2 жил өмнө
parent
commit
8ea0f40a3a

+ 9 - 6
src/utils/init/index.js

@@ -6,7 +6,7 @@ export const initColumns = (
 ) => {
   return arr
     .map((element) => {
-      let config = element.config || {};
+      element.config = element.config || {};
       const type = element.type;
       if (type === "Input") {
       }
@@ -14,20 +14,23 @@ export const initColumns = (
         prop.readonly = true;
       }
       if (type === "InputNumber") {
-        config = { controlsPosition: "right", ...config };
+        element.config = { controlsPosition: "right", ...element.config };
       }
       if (type === "Select") {
       }
       if (type === "DatePicker") {
-        config = { type: "date", ...config };
+        element.config = { type: "date", ...element.config };
       }
-      return { config, ...element, ...prop };
+      if (type === "DatePicker") {
+        element.value = [];
+      }
+      return { ...element, ...prop };
     })
     .map((element) => {
-      let value = "";
+      let { value } = element;
       if (element.type === "DatePicker") value = new Date();
       else if (element.type === "InputNumber") value = 1;
-      else value = "1";
+      else value = value || "1";
       return { ...element, value };
     });
 };

+ 1 - 1
src/views/input-dialog/api/index.js

@@ -10,7 +10,7 @@ export function list(url, params) {
 
 export function refer(data, params) {
   return request({
-    url: `/refer/query?pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    url: "/refer/query",
     method: "POST",
     data: data,
     params: params,

+ 8 - 1
src/views/input-dialog/index.vue

@@ -11,6 +11,7 @@ export default {
     "clearable",
     "disabled",
     "readonly",
+    "size",
   ],
   components: {
     InputDialog: () => import("./components/index.vue"),
@@ -50,6 +51,7 @@ export default {
     :clearable="clearable"
     :disabled="disabled"
     :readonly="readonly"
+    :size="size"
     style="width: 100%; cursor: pointer"
     @click.native.stop="handleAsyncOpenDialog"
   >
@@ -64,4 +66,9 @@ export default {
     </template>
   </el-input>
 </template>
-<style scoped></style>
+<style scoped>
+::v-deep.el-input .el-input__suffix {
+  display: flex;
+  align-items: center;
+}
+</style>

+ 12 - 24
src/views/purchase/purchase-contract/add/index.vue

@@ -17,6 +17,7 @@ export default {
   },
   data() {
     return {
+      size: "mini",
       visible: false,
       columns: NewColumns,
       rules: initRules(NewColumns),
@@ -111,7 +112,7 @@ export default {
     @close="$emit('close')"
   >
     <el-form
-      size="mini"
+      :size="size"
       label-position="right"
       label-width="135px"
       :model="params"
@@ -135,11 +136,11 @@ export default {
         >
           <h3>新增</h3>
           <div style="text-align: right">
-            <el-button size="mini" @click="handleCancel">取消</el-button>
-            <el-button size="mini" type="danger" @click="handleSava"
+            <el-button :size="size" @click="handleCancel">取消</el-button>
+            <el-button :size="size" type="danger" @click="handleSava"
               >保存</el-button
             >
-            <el-button size="mini" type="info" @click="handleSubmit">
+            <el-button :size="size" type="info" @click="handleSubmit">
               保存并新增
             </el-button>
           </div>
@@ -248,16 +249,16 @@ export default {
                 :file-list="params[column.key]"
                 :disabled="column.disabled"
                 drag
-                action="https://jsonplaceholder.typicode.com/posts/"
+                action="https://sy.derom.com/document-center/fastdfs/upload"
                 multiple
               >
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">
                   将文件拖到此处,或<em>点击上传</em>
                 </div>
-                <div class="el-upload__tip" slot="tip">
+                <!-- <div class="el-upload__tip" slot="tip">
                   只能上传jpg/png文件,且不超过500kb
-                </div>
+                </div> -->
               </el-upload>
             </el-form-item>
           </el-col>
@@ -297,7 +298,7 @@ export default {
                     :placeholder="cColumn.placeholder"
                     :clearable="cColumn.clearable"
                     :disabled="cColumn.disabled"
-                    size="mini"
+                    :size="size"
                     style="width: 100%"
                   ></el-input>
                   <dr-input-dialog
@@ -311,7 +312,7 @@ export default {
                     :type="cColumn.config.componentName"
                     :data-mapping="cColumn.config.dataMapping"
                     :source.sync="scope.row"
-                    size="mini"
+                    :size="size"
                   >
                   </dr-input-dialog>
                   <el-input-number
@@ -321,22 +322,9 @@ export default {
                     :placeholder="cColumn.placeholder"
                     :clearable="cColumn.clearable"
                     :disabled="cColumn.disabled"
-                    size="mini"
+                    :size="size"
                     style="width: 100%"
                   ></el-input-number>
-                  <el-input
-                    v-if="column.type === 'InputDialog'"
-                    v-model="params[column.key]"
-                    :placeholder="column.placeholder"
-                    :clearable="column.clearable"
-                    :disabled="column.disabled"
-                    :readonly="column.readonly"
-                    style="width: 100%; cursor: pointer"
-                  >
-                    <template #suffix>
-                      <el-icon class="el-icon-thumb"></el-icon>
-                    </template>
-                  </el-input>
                 </template>
               </el-table-column>
               <el-table-column fixed="right" label="操作" width="120">
@@ -356,7 +344,7 @@ export default {
           </el-tab-pane>
         </el-tabs>
         <el-row style="position: absolute; top: 20px; right: 20px">
-          <el-button size="mini" @click="addTableRow(params[tabName])"
+          <el-button :size="size" @click="addTableRow(params[tabName])"
             >增行</el-button
           >
         </el-row>