Merge branch 'dev-yjl' into 'shenzhen-dev'

中建五局-页面调整

See merge request !152

src/assets/js/api/materialManagement.js

@@ -63,12 +63,15 @@ export const deletGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt
 export const editGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/edit', data);
 export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/gt/gtMaterialSupplierEvaluationRecord/page', data);
 
-//出入库管理_
 
-export const addGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/add', data);
+
+//出入库管理
+export const addGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/addWithMaterial', data);
 export const deletGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/delete', data);
 export const editGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/edit', data);
-export const gettGMaterialInOutWarehouseAPageApi = data => get('/xmgl/gt/gtMaterialInOutWarehouse/page', data);
+export const gettGMaterialInOutWarehousePageApi = data => get('/xmgl/gt/gtMaterialInOutWarehouse/page', data);//查询表单数据
+export const gettGMaterialInOutWarehouseListApi = data => get('/xmgl/gt/gtMaterialPointCheckIntoWarehouseDetail/list', data);//根据id查物料
+
 
 
 

src/router/index.js

@@ -1442,6 +1442,12 @@ const routes2 = [
         name: '信息播报',
         component: resolve => require(['@/views/projectFront/informatioBroadcast/broadcast.vue'], resolve)
       },
+      //质量标准
+      {
+        path: '/project/basicSetup/checkItem',
+        name: '质量管理质量标准',
+        component: resolve => require(['@/views/companyAdmin/basicSetup/checkItem.vue'], resolve)
+      },
 
     ],
   },
@@ -2555,6 +2561,8 @@ const routes2 = [
         component: resolve => require(['@/views/projectFront/quality/recordsCenter.vue'], resolve)
       },
       
+    
+      
       // 材料管理
       {
         path: '/projectQu/materialManage/constructionTeamManage',

src/store/index.js

@@ -48,12 +48,12 @@ export default new Vuex.Store({
     BASEURL: baseUrl
       ? baseUrl
       : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    // UPLOADURL:
+    UPLOADURL:
-    //   window.location.protocol +
+      window.location.protocol +
-    //   "//" +
+      "//" +
-    //   window.location.host +
+      window.location.host +
-    //   "/upload/image", //正式环境
+      "/upload/image", //正式环境
-    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl
@@ -89,8 +89,8 @@ export default new Vuex.Store({
     // FILEURL: 'http://182.90.224.147:100/image/',//演示平台
     // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地
     // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地
-    UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地
+    // UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地
-    FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
+    // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
     // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
     // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
 

src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue

@@ -12,7 +12,7 @@
           <el-input v-model="searchForm.number" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item label="货号">
-          <el-input v-model="searchForm.test1" placeholder="请输入"></el-input>
+          <el-input v-model="searchForm.stuffNumber" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item label="仓库">
           <el-input
@@ -39,7 +39,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="助查码">
-          <el-input v-model="searchForm.test2" placeholder="请输入"></el-input>
+          <el-input v-model="searchForm.lookupCode" placeholder="请输入"></el-input>
         </el-form-item>
 
         <el-form-item label="日期">
@@ -49,6 +49,7 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -594,7 +595,8 @@ import {
   addGtMaterialInOutWarehouseApi,
   deletGtMaterialInOutWarehouseApi,
   editGtMaterialInOutWarehouseApi,
-  gettGMaterialInOutWarehouseAPageApi
+  gettGMaterialInOutWarehousePageApi,//查询表单数据
+  gettGMaterialInOutWarehouseListApi,//根据id查询物料
 } from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
@@ -606,14 +608,15 @@ export default {
       detailData:{},
       searchForm: {
         number: "",
-        // test1:"",//货号
+        stuffNumber:"",//货号
         warehouse: "",
         department: "",
         category: "",
         handler: "",
-        test: "",//助查码
+        lookupCode: "",//助查码
-        // 开始结束 :"",
         vendor: "",
+        startTime:'',//开始时间
+        endTime:'',//结束时间
       },//查询
       addForm: {
         createTime: "",
@@ -664,7 +667,7 @@ export default {
     importMaterial() {
       let statusType = true;
       this.orderMaterialList.forEach((item) => {
-        if (item.name == "" || item.specifications == "" || item.unit == "" || item.materialNum == "" || item.unitPrice == "" || item.computeUnit == "" || item.remark == "") {
+        if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "" || item.unitPrice == "" || item.amount == "" || item.remark == "") {
           this.$message({
             message: "请完善信息后在添加",
             type: "warning",
@@ -695,12 +698,18 @@ export default {
     },
     //查询仓库数据
     getList() {
-      getStuffWarehousePageApi({
+      gettGMaterialInOutWarehousePageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        warehouseName: this.searchForm.warehouseName,
+        number: this.searchForm.number,
-        warehousePos: this.searchForm.warehousePos,
+        stuffNumber: this.searchForm.stuffNumber,
+        warehouse: this.searchForm.warehouse,
+        department: this.searchForm.department,
+        category: this.searchForm.category,
+        handler: this.searchForm.handler,
+        lookupCode: this.searchForm.lookupCode,
+        vendor: this.searchForm.vendor,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -710,14 +719,14 @@ export default {
     },
 
     add() {
-      this.title = '新增'
+      this.title = '新增入库'
       this.dialogShow = true
       this.orderMaterialList = []
       this.close()
     },
 
     edit(obj) {
-      this.title = '编辑'
+      this.title = '编辑入库'
       this.dialogShow = true
       this.addEditForm = JSON.parse(JSON.stringify(obj))
     },
@@ -726,16 +735,16 @@ export default {
       params.projectSn = this.$store.state.projectSn
       this.$refs.addEditForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增仓库') {
+          if (this.title == '新增入库') {
-            addStuffWarehouseApi(params).then((result) => {
+            addGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑仓库') {
+          } else if (this.title === '编辑入库') {
             console.log('编辑信息', this.addEditForm)
-            editStuffWarehouseApi(params).then((result) => {
+            editGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -755,7 +764,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
+          deletGtMaterialInOutWarehouseApi({ id: obj.id }).then((res) => {
             if (res.success) {
               this.getList()
               this.$message({

src/views/projectFront/quality/recordsModule/inspectionRecord.vue

@@ -352,20 +352,7 @@
               :model="addForm1"
               label-width="120px"
             >
-              <!-- 图纸定位 -->
+            
-              <el-form-item
-                v-if="COMPANY != 'longguang'"
-                :label="$t('message.quality.drawingPositioning')"
-              >
-                <el-button
-                  :disabled="type == 'detail'"
-                  type="text"
-                  icon="el-icon-location-information"
-                  @click="drawingPositionBtn"
-                  >{{ $t('message.quality.positionOnTheDrawing') }}</el-button
-                >
-                <!-- {{ $t('message.quality.selectDrawings') }} -->
-              </el-form-item>
               <!--              检查部位-->
               <el-form-item
                 :label="$t('message.quality.checkPoint')"
@@ -798,6 +785,20 @@
                   :inactive-value="2"
                 >
                 </el-switch>
+              </el-form-item>
+                <!-- 图纸定位 -->
+                <el-form-item
+                v-if="COMPANY != 'longguang'"
+                :label="$t('message.quality.drawingPositioning')"
+              >
+                <el-button
+                  :disabled="type == 'detail'"
+                  type="text"
+                  icon="el-icon-location-information"
+                  @click="drawingPositionBtn"
+                  >{{ $t('message.quality.positionOnTheDrawing') }}</el-button
+                >
+                <!-- {{ $t('message.quality.selectDrawings') }} -->
               </el-form-item>
               <!--              上传图片-->
               <el-form-item
@@ -1161,7 +1162,6 @@
     <!-- 图纸定位 -->
     <el-dialog
       :modal-append-to-body="false"
-      @close="close"
       :title="$t('message.quality.drawingPositioning')"
       :visible.sync="showPositioning"
       width="1000px"