Browse Source

Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

lucw 2 ngày trước cách đây
mục cha
commit
c22fb44efb

+ 10 - 0
src/BIZComponents/selectStockLedger/item-search.vue

@@ -82,6 +82,15 @@
             ></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="图号/件号:" prop="imgCode" label-width="90px">
+            <el-input
+              clearable
+              v-model.trim="params.imgCode"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="型号:" prop="categoryModel">
             <el-input
@@ -205,6 +214,7 @@
         specification: '',
         code: '',
         categoryCode: '',
+        imgCode: '',
         categoryModel: '',
         assetName: '',
         qualityResult: '',

+ 7 - 0
src/BIZComponents/selectStockLedger/selectStockLedgerDialog.vue

@@ -221,6 +221,13 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'imgCode',
+            label: '图号/件号',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 120
+          },
           {
             prop: 'categoryName',
             label: '名称',

+ 19 - 23
src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -22,6 +22,25 @@
       element-loading-text="正在加载复制数据…"
     >
       <headerTitle title="订单信息"></headerTitle>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="项目名称" prop="projectName">
+            <el-input
+              clearable
+              v-model="form.projectName"
+              placeholder="请输入"
+              style="width: calc(100% - 90px)"
+            />
+            <el-button
+              style="margin-left: 5px"
+              size="small"
+              type="primary"
+              @click.native="handleProjectBtn"
+              >选择
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item label="订单类型" prop="sourceType">
@@ -204,29 +223,6 @@
           
         </el-col>
         <el-col :span="8">
-          <!-- <el-form-item label="项目名称" prop="projectName">
-            <el-input
-              clearable
-              v-model="form.projectName"
-              placeholder="请输入"
-            />
-          </el-form-item> -->
-          <el-form-item label="项目名称" prop="projectName">
-            <el-input
-              clearable
-              v-model="form.projectName"
-              placeholder="请输入"
-              style="width: calc(100% - 80px)"
-            />
-            <el-button
-              style="margin-left: 5px"
-              size="small"
-              type="primary"
-              @click.native="handleProjectBtn"
-              >选择
-            </el-button>
-          </el-form-item>
-          
           <el-form-item label="需求人" prop="requireUserId">
             <personSelect
               ref="directorRef"

+ 3 - 3
vue.config.js

@@ -2,7 +2,7 @@
  * @Author: mlchen 374826075@qq.com
  * @Date: 2026-07-22 15:43:30
  * @LastEditors: mlchen 374826075@qq.com
- * @LastEditTime: 2026-11-19 17:00:39
+ * @LastEditTime: 2026-11-20 14:28:23
  * @FilePath: /kd-aiot-frontend-eom/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -61,12 +61,12 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://192.168.1.251:18086', //开发
-        // target: 'http://localhost:18086', //开发 // 本地联调临时指向本机后端(2026-11-05,联调后还原)
+        target: 'http://localhost:18086', //开发 // 本地联调临时指向本机后端(2026-11-05,联调后还原)
         // target: 'http://192.168.1.251:18186', //测试
         // target: 'http://192.168.1.15:18086',//罗
         // target: 'http://192.168.1.144:18086',//付
         // target: 'http://192.168.1.9:18086', //c
-        target: 'https://aiot.zoomwin.com.cn:51001/api',
+        // target: 'https://aiot.zoomwin.com.cn:51001/api',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''