update 0625 配方详情

public/index.html

@@ -38,8 +38,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.103:8080/pms-am';
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.62:8080/pms-am'; // tao
+    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.62:8080/pms-am'; // tao
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.21:8080/pms-am'; // xv
     // window.SITE_CONFIG['apiURL'] = 'http://localhost:3000/p//////ms-am'; // xv
     </script>

src/components/SmallDialog.vue

@@ -27,7 +27,10 @@
                 v-bind="col.elparams"
                 @change="handleSelectChange(col, $event)"
               >
-                <el-option v-for="(opt, optIdx) in col.options" :key="'option_' + optIdx" :label="opt.label" :value="opt.value" />
+                <el-option v-for="(opt, optIdx) in col.options" :key="'option_' + optIdx" :label="opt.label" :value="opt.value">
+                  <span>{{ opt.label }}</span>
+                  <span v-if="col.customLabel" style="display: inline-clock; margin-left: 12px; font-size: .9em; color: #ccce;">{{ opt[col.customLabel] || '-' }}</span>
+                </el-option>
               </el-select>
               <el-switch
                 v-if="col.switch"
@@ -95,8 +98,11 @@ export default {
               this.$set(
                 col,
                 "options",
-                res.data.list.map((item) => ({ label: item.name, value: item.id }))
+                !col.customLabel
+                ? res.data.list.map((item) => ({ label: item.name, value: item.id }))
+                : res.data.list.map((item) => ({ label: item.name, value: item.id, [col.customLabel]: item[col.customLabel] }))
               );
+              console.log(res.data.list.map((item) => ({ label: item.name, value: item.id, [col.customLabel]: item[col.customLabel] })))
             } else {
               this.$set(col, "options", []);
             }

src/views/modules/pms/bomDetails/config.js

@@ -174,6 +174,7 @@ export default function () {
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
             elparams: { placeholder: "请选择物料", filterable: true },
             options: [],
+            customLabel: 'description',
             fetchData: () => this.$http.get("/pms/material/page", { params: { limit: 999, page: 1 } }),
           },
         ],