样品 不良品 修改

src/api/unacceptedProduct/index.js

@@ -74,7 +74,8 @@ export async function deleteUnacceptedProductDetail(data) {
  * 返工返修台账
  */
 export async function getReworkList(data) {
-  const res = await request.get('/qms/qmsreturnrepairwork/page', data);
+   let par = new URLSearchParams(data);
+  const res = await request.get('/qms/qmsreturnrepairwork/page?' + par);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -112,7 +113,8 @@ export async function transformation(data, type) {
  * 试销品台账
  */
 export async function trialProducts(data) {
-  const res = await request.get('/qms/qmstrialproducts/page', data);
+   let par = new URLSearchParams(data);
+  const res = await request.get('/qms/qmstrialproducts/page?' + par);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -131,9 +133,7 @@ export async function deleteTrialProducts(data) {
  */
 export async function scrapProducts(data) {
   let par = new URLSearchParams(data);
-  console.log(par);
-
-  const res = await request.get('/qms/qmsscrapproducts/page' + par, {});
+  const res = await request.get('/qms/qmsscrapproducts/page?' + par);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -170,7 +170,8 @@ export async function disposeApi(data) {
 /* 消耗品台账
  */
 export async function getConsumeproductsList(data) {
-  const res = await request.get('/qms/qmsconsumeproducts/page', data);
+  let par = new URLSearchParams(data);
+  const res = await request.get('/qms/qmsconsumeproducts/page?' + par);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -180,7 +181,8 @@ export async function getConsumeproductsList(data) {
 /* 退货品台账
  */
 export async function getReturngoodsList(data) {
-  const res = await request.get('/qms/qmsreturngoods/page', data);
+  let par = new URLSearchParams(data);
+  const res = await request.get('/qms/qmsreturngoods/page?' + par);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -190,7 +192,8 @@ export async function getReturngoodsList(data) {
 /* 让步接收
  */
 export async function getConcessionacceptanceList(data) {
-  const res = await request.get('/qms/qmsconcessionacceptance/page', data);
+  let par = new URLSearchParams(data);
+  const res = await request.get('/qms/qmsconcessionacceptance/page?' + par);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -200,7 +203,8 @@ export async function getConcessionacceptanceList(data) {
 /* 降级使用
  */
 export async function getDowngradeuseList(data) {
-  const res = await request.get('/qms/qmsdowngradeuse/page', data);
+  let par = new URLSearchParams(data);
+  const res = await request.get('/qms/qmsdowngradeuse/page?' + par);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -210,7 +214,8 @@ export async function getDowngradeuseList(data) {
 /* 留样
  */
 export async function getKeepsampleList(data) {
-  const res = await request.get('/qms/keepsample/page', data);
+   let par = new URLSearchParams(data);
+  const res = await request.get('/qms/keepsample/page?' + par);
   if (res.data.code == 0) {
     return res.data.data;
   }

src/views/unqualifiedProduct/unqualifiedList/components/create.vue

@@ -33,7 +33,7 @@
           <el-form-item label="数量:">
             <el-input
               :maxlength="20"
-              v-model="form.unqualifiedQuantity"
+              v-model="form.quantity"
               disabled
             />
           </el-form-item>
@@ -240,7 +240,7 @@
           produceRoutingName: '',
           taskId: '',
           taskName: '',
-          unqualifiedQuantity: '',
+          quantity: '',
           measureQuantity: '',
           measureUnit: '',
           weight: '',
@@ -357,7 +357,7 @@
         this.form.produceRoutingName = data.produceRoutingName;
         this.form.taskId = data.taskId;
         this.form.taskName = data.taskName;
-        this.form.unqualifiedQuantity = data.unqualifiedQuantity;
+        this.form.quantity = data.quantity;
 
         this.form.measureQuantity = data.measureQuantity;
         this.form.measureUnit = data.measureUnit;
@@ -366,6 +366,9 @@
 
         this.form.poList = data.poList;
 
+        console.log(this.form);
+        
+
         // getDetail(row.id).then((res) => {
         //   // this.getProduceTaskList();
         //   // this.form.poList = res;
@@ -486,7 +489,7 @@
               categoryName: item.name,
               categoryId: item.id,
               brandNum: item.brandNum,
-              brandNo: item.batchNo,
+              batchNo: item.batchNo,
               specification: item.specification,
               modelType: item.modelType,
               engrave: '',
@@ -498,7 +501,7 @@
               produceTaskName: '',
               measureQuantity: '',
               measureUnit: item.measuringUnit,
-              weight: '',
+              weight: item.netWeight,
               weightUnit: item.weightUnit
             };
           }
@@ -507,14 +510,14 @@
         this.form.categoryName = data[0].name;
         this.form.categoryId = data[0].id;
         this.form.brandNum = data[0].brandNum;
-        this.form.brandNo = data[0].batchNo;
+        this.form.batchNo = data[0].batchNo;
         this.form.specification = data[0].specification;
         this.form.modelType = data[0].modelType;
         this.form.measureQuantity = '';
         this.form.measureUnit = data[0].measuringUnit;
-        this.form.weight = '';
+        this.form.weight = data[0].netWeight;
         this.form.weightUnit = data[0].weightUnit;
-        this.form.unqualifiedQuantity = data.length;
+        this.form.quantity = data.length;
 
         this.form.poList = this.form.poList.concat(list);
 

src/views/unqualifiedProduct/unqualifiedList/detailList.vue

@@ -485,14 +485,14 @@
           //     return this.getDictValue('不良品处理类型', cellValue + '');
           //   }
           // },
-          {
-            prop: 'status',
-            label: '状态',
-            align: 'center',
-            formatter: (row, column, cellValue) => {
-              return unacceptedProductStatus(cellValue);
-            }
-          },
+          // {
+          //   prop: 'status',
+          //   label: '状态',
+          //   align: 'center',
+          //   formatter: (row, column, cellValue) => {
+          //     return unacceptedProductStatus(cellValue);
+          //   }
+          // },
 
           {
             columnKey: 'action',

src/views/unqualifiedProduct/unqualifiedList/index.vue

@@ -44,7 +44,7 @@
             </template>
           </el-popconfirm>
           <el-link
-            v-if="row.status == 0||row.status == 1"
+            v-if="row.status == 0 || row.status == 1"
             type="primary"
             :underline="false"
             icon="el-icon-edit"
@@ -148,40 +148,41 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'unit',
-            label: '计量单位',
-            align: 'center',
-            width: 100,
-            showOverflowTooltip: true
-          },
-          {
-            prop: 'batchNo',
-            label: '批次号',
-            align: 'center',
-            width: 100,
-            showOverflowTooltip: true
-          },
-          {
-            prop: 'unqualifiedQuantity',
+            prop: 'quantity',
             label: '数量',
             align: 'center',
             width: 80,
             showOverflowTooltip: true
           },
           {
-            prop: 'weight',
-            label: '重量',
+            prop: 'unit',
+            label: '计量单位',
             align: 'center',
             width: 100,
             showOverflowTooltip: true
           },
           {
-            prop: 'weightUnit',
-            label: '重量单位',
+            prop: 'batchNo',
+            label: '批次号',
             align: 'center',
             width: 100,
             showOverflowTooltip: true
           },
+
+          // {
+          //   prop: 'weight',
+          //   label: '重量',
+          //   align: 'center',
+          //   width: 100,
+          //   showOverflowTooltip: true
+          // },
+          // {
+          //   prop: 'weightUnit',
+          //   label: '重量单位',
+          //   align: 'center',
+          //   width: 100,
+          //   showOverflowTooltip: true
+          // },
           {
             prop: 'produceRoutingName',
             label: '工艺路线',
@@ -215,10 +216,9 @@
             prop: 'status',
             label: '状态',
             align: 'center',
-            width: 100,
-            showOverflowTooltip: true,
+            width: 80,
             formatter: (row, column, cellValue) => {
-              return unacceptedProductStatus(cellValue);
+              return this.getDictName('处置状态', cellValue);
             }
           },
 

src/views/unqualifiedProduct/unqualifiedList/rework/index.vue

@@ -76,7 +76,8 @@
 </template>
 
 <script>
-  import OrderSearch from '../components/rework-search.vue';
+ import OrderSearch from '../components/probationalGoods-search.vue';
+  // import OrderSearch from '../components/rework-search.vue';
   import SalesToProduction from '../components/salesToProduction.vue';
   import dictMixins from '@/mixins/dictMixins';
   // import { reworkStatus } from '@/utils/util';