基础信息页面完成

package-lock.json

@@ -4677,7 +4677,7 @@
       "dependencies": {
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -10555,7 +10555,7 @@
       "dependencies": {
         "lodash": {
           "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "resolved": "https://registry.nlark.com/lodash/download/lodash-4.17.4.tgz",
           "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
           "dev": true
         }
@@ -13272,7 +13272,7 @@
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/jsesc/download/jsesc-0.5.0.tgz?cache=0&sync_timestamp=1603900010788&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsesc%2Fdownload%2Fjsesc-0.5.0.tgz",
           "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
           "dev": true
         }
@@ -13513,13 +13513,13 @@
         },
         "has-flag": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz",
           "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
           "dev": true
         },
         "supports-color": {
           "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-4.5.0.tgz?cache=0&sync_timestamp=1618560983872&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-4.5.0.tgz",
           "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
@@ -13868,7 +13868,7 @@
         },
         "http-errors": {
           "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/http-errors/download/http-errors-1.6.3.tgz",
           "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
           "dev": true,
           "requires": {
@@ -13880,7 +13880,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz",
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
@@ -14089,7 +14089,7 @@
       "dependencies": {
         "is-fullwidth-code-point": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz?cache=0&sync_timestamp=1618552489864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         }
@@ -14122,7 +14122,7 @@
         },
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -14714,13 +14714,13 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
         "ansi-styles": {
           "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
@@ -14744,7 +14744,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1618995367379&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -14757,7 +14757,7 @@
           "dependencies": {
             "supports-color": {
               "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1618560983872&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
               "dev": true
             }
@@ -14777,7 +14777,7 @@
         },
         "has-flag": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
           "dev": true
         },
@@ -14842,7 +14842,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
@@ -14851,7 +14851,7 @@
         },
         "supports-color": {
           "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz?cache=0&sync_timestamp=1618560983872&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz",
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
@@ -14883,7 +14883,7 @@
       "dependencies": {
         "deepmerge": {
           "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.3.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.3.2.tgz",
           "integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
           "dev": true
         }
@@ -14908,7 +14908,7 @@
       "dependencies": {
         "deepmerge": {
           "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.3.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.3.2.tgz",
           "integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
           "dev": true
         }
@@ -15037,7 +15037,7 @@
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz?cache=0&sync_timestamp=1618552489864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },

src/views/basic_data/material/components/modify_list-apply.vue

@@ -95,49 +95,49 @@
           <el-table-column
             align="center"
             label="销售类型"
-            prop="bianma"
+            prop="SalesType"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货编码"
-            prop="selectname"
+            prop="code"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货名称"
-            prop="person"
+            prop="name"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="规格型号"
-            prop="createdata"
+            prop="model"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="计量单位"
-            prop="updateperson"
+            prop="company"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="批发价"
-            prop="update"
+            prop="wholesale"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="零售价"
-            prop="caozuo"
+            prop="retail"
             min-width="160"
             show-overflow-tooltip
           >
@@ -145,7 +145,7 @@
           <el-table-column
             align="center"
             label="返利使用比例"
-            prop="caozuo"
+            prop="rebate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -153,7 +153,7 @@
           <el-table-column
             align="center"
             label="生效日期"
-            prop="caozuo"
+            prop="effectiveDate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -161,7 +161,7 @@
           <el-table-column
             align="center"
             label="失效日期"
-            prop="caozuo"
+            prop="expiryDate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -169,7 +169,7 @@
           <el-table-column
             align="center"
             label="是否促销价"
-            prop="caozuo"
+            prop="promotion"
             min-width="160"
             show-overflow-tooltip
           >
@@ -177,7 +177,7 @@
           <el-table-column
             align="center"
             label="数量"
-            prop="caozuo"
+            prop="number"
             min-width="160"
             show-overflow-tooltip
           >
@@ -185,7 +185,7 @@
           <el-table-column
             align="center"
             label="发布"
-            prop="caozuo"
+            prop="release"
             min-width="160"
             show-overflow-tooltip
           >
@@ -198,6 +198,27 @@
 
 <script>
 export default {
+  data() {
+    return {
+      dataList: [
+        {
+          SalesType: "*一票机*",
+          code: "23022051775",
+          name: "夏之凉变频1",
+          model: "KFR-26GW",
+          company: "套",
+          wholesale: "2999",
+          retail: "2899",
+          rebate: "0.8",
+          effectiveDate: "2021-11-02",
+          expiryDate: "2021-11-02",
+          promotion: "否",
+          number: "51",
+          release: "是",
+        },
+      ],
+    };
+  },
   methods: {
     goBack() {
       console.log(this.$parent);

src/views/basic_data/material/components/modify_list-approval.vue

@@ -56,13 +56,6 @@
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="" class="fr">
-              <el-button size="small">清空</el-button>
-              <el-button size="small" type="primary">提交</el-button>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
     </div>
@@ -81,49 +74,49 @@
           <el-table-column
             align="center"
             label="销售类型"
-            prop="bianma"
+            prop="SalesType"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货编码"
-            prop="selectname"
+            prop="code"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货名称"
-            prop="person"
+            prop="name"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="规格型号"
-            prop="createdata"
+            prop="model"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="计量单位"
-            prop="updateperson"
+            prop="company"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="批发价"
-            prop="update"
+            prop="wholesale"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="零售价"
-            prop="caozuo"
+            prop="retail"
             min-width="160"
             show-overflow-tooltip
           >
@@ -131,7 +124,7 @@
           <el-table-column
             align="center"
             label="返利使用比例"
-            prop="caozuo"
+            prop="rebate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -139,7 +132,7 @@
           <el-table-column
             align="center"
             label="生效日期"
-            prop="caozuo"
+            prop="effectiveDate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -147,7 +140,7 @@
           <el-table-column
             align="center"
             label="失效日期"
-            prop="caozuo"
+            prop="expiryDate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -155,7 +148,7 @@
           <el-table-column
             align="center"
             label="是否促销价"
-            prop="caozuo"
+            prop="promotion"
             min-width="160"
             show-overflow-tooltip
           >
@@ -163,7 +156,7 @@
           <el-table-column
             align="center"
             label="数量"
-            prop="caozuo"
+            prop="number"
             min-width="160"
             show-overflow-tooltip
           >
@@ -171,7 +164,7 @@
           <el-table-column
             align="center"
             label="发布"
-            prop="caozuo"
+            prop="release"
             min-width="160"
             show-overflow-tooltip
           >
@@ -186,6 +179,27 @@
         <hr />
       </el-col>
     </el-row>
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :xs="12" :sm="12" :lg="12" class="item">
+          <div class="label">审批人</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :xs="12" :sm="12" :lg="12" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">
+            <el-radio v-model="radio" label="1">通过</el-radio>
+            <el-radio v-model="radio" label="2">驳回</el-radio>
+          </div>
+        </el-col>
+
+        <el-col :xs="24" :sm="24" :lg="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+      </el-row>
+    </div>
+    <br />
     <div class="btn-group clearfix">
       <div class="fl">
         <el-button type="primary" size="small">提交审批</el-button>
@@ -197,6 +211,28 @@
 
 <script>
 export default {
+  data() {
+    return {
+      radio: "",
+      dataList: [
+        {
+          SalesType: "*一票机*",
+          code: "23022051775",
+          name: "夏之凉变频1",
+          model: "KFR-26GW",
+          company: "套",
+          wholesale: "2999",
+          retail: "2899",
+          rebate: "0.8",
+          effectiveDate: "2021-11-02",
+          expiryDate: "2021-11-02",
+          promotion: "否",
+          number: "51",
+          release: "是",
+        },
+      ],
+    };
+  },
   methods: {
     goBack() {
       console.log(this.$parent);

src/views/basic_data/material/components/modify_list-detail.vue

@@ -74,49 +74,49 @@
           <el-table-column
             align="center"
             label="销售类型"
-            prop="bianma"
+            prop="SalesType"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货编码"
-            prop="selectname"
+            prop="code"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货名称"
-            prop="person"
+            prop="name"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="规格型号"
-            prop="createdata"
+            prop="model"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="计量单位"
-            prop="updateperson"
+            prop="company"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="批发价"
-            prop="update"
+            prop="wholesale"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="零售价"
-            prop="caozuo"
+            prop="retail"
             min-width="160"
             show-overflow-tooltip
           >
@@ -124,7 +124,7 @@
           <el-table-column
             align="center"
             label="返利使用比例"
-            prop="caozuo"
+            prop="rebate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -132,7 +132,7 @@
           <el-table-column
             align="center"
             label="生效日期"
-            prop="caozuo"
+            prop="effectiveDate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -140,7 +140,7 @@
           <el-table-column
             align="center"
             label="失效日期"
-            prop="caozuo"
+            prop="expiryDate"
             min-width="160"
             show-overflow-tooltip
           >
@@ -148,7 +148,7 @@
           <el-table-column
             align="center"
             label="是否促销价"
-            prop="caozuo"
+            prop="promotion"
             min-width="160"
             show-overflow-tooltip
           >
@@ -156,7 +156,7 @@
           <el-table-column
             align="center"
             label="数量"
-            prop="caozuo"
+            prop="number"
             min-width="160"
             show-overflow-tooltip
           >
@@ -164,7 +164,7 @@
           <el-table-column
             align="center"
             label="发布"
-            prop="caozuo"
+            prop="release"
             min-width="160"
             show-overflow-tooltip
           >
@@ -172,11 +172,53 @@
         </el-table>
       </div>
     </div>
+    <br />
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :xs="12" :sm="8" :lg="8" class="item">
+          <div class="label">审批人</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :xs="12" :sm="8" :lg="8" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :xs="12" :sm="8" :lg="8" class="item">
+          <div class="label">审批时间</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">2022123233435342</div>
+        </el-col>
+      </el-row>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
+  data() {
+    return {
+      dataList: [
+        {
+          SalesType: "*一票机*",
+          code: "23022051775",
+          name: "夏之凉变频1",
+          model: "KFR-26GW",
+          company: "套",
+          wholesale: "2999",
+          retail: "2899",
+          rebate: "0.8",
+          effectiveDate: "2021-11-02",
+          expiryDate: "2021-11-02",
+          promotion: "否",
+          number: "51",
+          release: "是",
+        },
+      ],
+    };
+  },
   methods: {
     goBack() {
       console.log(this.$parent);

src/views/basic_data/material/machine_list.vue

@@ -189,17 +189,38 @@
 
     <!-- 弹窗 -->
     <el-dialog
-      title="仓库仓位对应关系"
+      title="产品信息"
       :visible.sync="showDialogForm"
       width="30%"
       :show-close="false"
       :close-on-click-modal="false"
     >
       <el-form ref="form" :model="diaLogForm" label-width="100px">
-        <el-form-item label="仓库名称">
+        <el-form-item label="内机名称">
+          <el-select
+            v-model="diaLogForm.positionName"
+            multiple
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="内机型号">
+          <el-input v-model="diaLogForm.storeName"></el-input>
+        </el-form-item>
+        <el-form-item label="内机编码">
           <el-input v-model="diaLogForm.storeName"></el-input>
         </el-form-item>
-        <el-form-item label="仓位名称">
+        <el-form-item label="内机体积">
+          <el-input v-model="diaLogForm.storeName"></el-input>
+        </el-form-item>
+        <el-form-item label="外机名称">
           <el-select
             v-model="diaLogForm.positionName"
             multiple
@@ -214,12 +235,20 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="库存警戒线">
+        <el-form-item label="外机机型号">
+          <el-input v-model="diaLogForm.storeName"></el-input>
+        </el-form-item>
+        <el-form-item label="外机编码">
+          <el-input v-model="diaLogForm.storeName"></el-input>
+        </el-form-item>
+        <el-form-item label="外机体积">
+          <el-input v-model="diaLogForm.storeName"></el-input>
+        </el-form-item>
+        <el-form-item label="配件1">
           <el-input v-model="diaLogForm.alert"></el-input>
         </el-form-item>
-        <el-form-item label="库存状态"> - </el-form-item>
-        <el-form-item label="备注">
-          <el-input type="textarea" v-model="diaLogForm.text"></el-input>
+        <el-form-item label="配件2">
+          <el-input v-model="diaLogForm.alert"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -357,12 +386,15 @@ export default {
     };
   },
   methods: {
-    addFn() {
+    editFn() {
       this.showDialogForm = true;
     },
   },
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
+::v-deep .el-select {
+  width: 100%;
+}
 </style>

src/views/basic_data/material/relation_list.vue

@@ -206,17 +206,38 @@
 
     <!-- 弹窗 -->
     <el-dialog
-      title="仓库仓位对应关系"
+      title="产品信息"
       :visible.sync="showDialogForm"
       width="30%"
       :show-close="false"
       :close-on-click-modal="false"
     >
       <el-form ref="form" :model="diaLogForm" label-width="100px">
-        <el-form-item label="仓库名称">
+        <el-form-item label="产品名称">
+          <el-select
+            v-model="diaLogForm.positionName"
+            multiple
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="产品型号">
           <el-input v-model="diaLogForm.storeName"></el-input>
         </el-form-item>
-        <el-form-item label="仓位名称">
+        <el-form-item label="套机棉麻">
+          <el-input v-model="diaLogForm.alert"></el-input>
+        </el-form-item>
+        <el-form-item label="产品体积">
+          <el-input v-model="diaLogForm.alert"></el-input>
+        </el-form-item>
+        <el-form-item label="内机编码">
           <el-select
             v-model="diaLogForm.positionName"
             multiple
@@ -231,12 +252,50 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="库存警戒线">
-          <el-input v-model="diaLogForm.alert"></el-input>
+        <el-form-item label="外机编码">
+          <el-select
+            v-model="diaLogForm.positionName"
+            multiple
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="库存状态"> - </el-form-item>
-        <el-form-item label="备注">
-          <el-input type="textarea" v-model="diaLogForm.text"></el-input>
+        <el-form-item label="配件1">
+          <el-select
+            v-model="diaLogForm.positionName"
+            multiple
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="配件2">
+          <el-select
+            v-model="diaLogForm.positionName"
+            multiple
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -350,12 +409,15 @@ export default {
     };
   },
   methods: {
-    addFn() {
+    editFn() {
       this.showDialogForm = true;
     },
   },
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
+::v-deep .el-select {
+  width: 100%;
+}
 </style>