提交

src/assets/el-style.scss

@@ -121,7 +121,7 @@
 }
 .form-collapse-item {
   .el-collapse-item__header {
-    height: 30px;
+    height: 40px;
     padding: 0 10px 0 20px;
     color: var(--color-bg-color);
     background: var(--brand-color);

src/components/DialogImport.vue

@@ -3,7 +3,7 @@
     :visible.sync="visible"
     title="导入数据"
     append-to-body
-    width="450px"
+    width="500px"
   >
     <el-form
       ref="form"
@@ -11,46 +11,52 @@
       label-width="80px"
       style="height:200px"
     >
-      <el-row :gutter="0">
-        <el-col :span="20">
-          <el-form-item prop="providerId" label="供应商" :rules="[{
-            required: true,
-            message: '请选择供应商'
-          }]">
-            <my-select
-              v-model="uploadData.providerId"
-              :options="providers"
-              filterable
-              placeholder="输入供应商全名或缩写"
-            ></my-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-collapse v-model="activeCollapseName" class="form-collapse">
+        <el-collapse-item title="采购信息" name="1" class="form-collapse-item">
+          <el-row :gutter="0">
+            <el-col :span="24">
+              <el-form-item prop="providerId" label="供应商" :rules="[{
+                required: true,
+                message: '请选择供应商'
+              }]">
+                <div style="padding-right:70px">
+                  <my-select
+                    v-model="uploadData.providerId"
+                    :options="providers"
+                    filterable
+                    placeholder="输入供应商全名或缩写"
+                  ></my-select>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-      <el-row :gutter="0">
-        <el-col :span="24">
-          <el-form-item prop="file" label="上传文件" :rules="[{
-            required: true,
-            message: '请选择需要上传的文件'
-          }]">
-            <el-input :value="uploadData.file ? uploadData.file.name : ''" read-only>
-              <template #append>
-                <el-upload
-                  ref="upload"
-                  action=""
-                  :auto-upload="false"
-                  :multiple="false"
-                  :show-file-list="false"
-                  accept=".csv"
-                  :on-change="onFileChange"
-                >
-                  <div class="el-button el-button--primary" style="border-radius: 0 4px 4px 0;">浏览</div>
-                </el-upload>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
+          <el-row :gutter="0">
+            <el-col :span="24">
+              <el-form-item prop="file" label="上传文件" :rules="[{
+                required: true,
+                message: '请选择需要上传的文件'
+              }]">
+                <el-input :value="uploadData.file ? uploadData.file.name : ''" read-only>
+                  <template #append>
+                    <el-upload
+                      ref="upload"
+                      action=""
+                      :auto-upload="false"
+                      :multiple="false"
+                      :show-file-list="false"
+                      accept=".csv"
+                      :on-change="onFileChange"
+                    >
+                      <div class="el-button el-button--primary" style="border-radius: 0 4px 4px 0;">浏览</div>
+                    </el-upload>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-collapse-item>
+      </el-collapse>
     </el-form>
 
     <template #footer>
@@ -86,6 +92,7 @@ export default {
   },
   data: () => ({
     visible: false,
+    activeCollapseName: '1',
     uploadData: {
       providerId: null,
       file: null

src/components/DialogTagPurchase.vue

@@ -3,62 +3,57 @@
     :visible.sync="visible"
     :title="`${operatorType.name}采购`"
     append-to-body
-    width="800"
+    width="750px"
   >
     <el-form
       v-if="data"
       ref="form"
       :model="data"
-      label-width="100px"
-      size="mini"
+      label-width="85px"
     >
       <el-collapse v-model="activeCollapseName" class="form-collapse">
         <el-collapse-item title="采购信息" name="1" class="form-collapse-item">
-          <el-row :gutter="$$Constant.LAYOUT_GAP">
-            <el-col :span="11">
-              <el-form-item label="标签供应商" prop="provider">
-                <my-select
-                  v-model="data.providerId"
-                  :options="optionGroup.Provider ? optionGroup.Provider.list : []"
-                ></my-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <div class="overflow-auto" style="max-height:300px;">
+            <el-row :gutter="$$Constant.LAYOUT_GAP">
+              <el-col :span="12">
+                <el-form-item label="标签供应商" prop="provider">
+                  <my-select
+                    v-model="data.providerId"
+                    :options="optionGroup.Provider ? optionGroup.Provider.list : []"
+                  ></my-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
-          <el-row :gutter="$$Constant.LAYOUT_GAP">
-            <el-col :span="11">
-              <el-form-item label="标签类型" prop="tagTypeId">
-                <my-select
-                  v-model="data.tagTypeId"
-                  :options="optionGroup.TagType ? optionGroup.TagType.list : []"
-                ></my-select>
-              </el-form-item>
-            </el-col>
+            <template v-if="operatorTypeId === 1">
 
-            <el-col :span="2">1</el-col>
+            </template>
+            <el-row v-else :gutter="$$Constant.LAYOUT_GAP">
+              <el-col :span="12">
+                <el-form-item label="标签类型" prop="tagTypeId">
+                  <my-select
+                    v-model="data.tagTypeId"
+                    :options="optionGroup.TagType ? optionGroup.TagType.list : []"
+                  ></my-select>
+                </el-form-item>
+              </el-col>
 
-            <el-col :span="11">
-              <el-form-item label="标签数量" prop="number">
-                <el-input v-model="data.number" type="number" />
-              </el-form-item>
-            </el-col>
-          </el-row>
+              <el-col :span="12">
+                <el-form-item label="标签数量" prop="number">
+                  <el-input v-model="data.number" type="number" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
         </el-collapse-item>
       </el-collapse>
     </el-form>
 
     <template #footer>
       <div class="flex center dialog-footer">
-        <el-button
-          size="mini"
-          @click="onCloseBtnClick"
-        >取消</el-button>
+        <el-button @click="onCloseBtnClick">取消</el-button>
 
-        <el-button
-          type="primary"
-          size="mini"
-          @click="onSaveBtnClick"
-        >确定</el-button>
+        <el-button type="primary" @click="onSaveBtnClick">确定</el-button>
       </div>
     </template>
   </el-dialog>

src/entries/TagPurchase.js

@@ -58,19 +58,24 @@ export default class TagPurchase extends BaseCurdEntry {
 
   constructor (editorInstance) {
     super()
+
     const { optionGroup } = editorInstance
-    const tagTypeConfig = optionGroup.TagType
-    const [ tagType ] = tagTypeConfig.list
-    if (tagType) {
-      this.tagTypeId = tagType[tagTypeConfig.Target.$$idProp]
-    }
 
-    console.log(optionGroup)
     const providerConfig = optionGroup.Provider
     const [ provider ] = providerConfig.list
     if (provider) {
       this.providerId = provider[providerConfig.Target.$$idProp]
     }
+
+    const tagTypeConfig = optionGroup.TagType
+    // const infos = []
+    this.infos = [{
+      tagTypeId: ''
+    }]
+    const [ tagType ] = tagTypeConfig.list
+    if (tagType) {
+      this.tagTypeId = tagType[tagTypeConfig.Target.$$idProp]
+    }
   }
 
   static get $$api () {