Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!432

src/components/popover-select-v2/index.vue

@@ -41,6 +41,13 @@ export default {
       type: Boolean,
       default: false,
     },
+    // 参照弹窗标题
+    title: {
+      type: String,
+      dafault: () => {
+        return "TITEL";
+      },
+    },
   },
   components: {
     ElSuperTable: () => import("@/components/super-table/index.vue"),

src/components/super-form/index.vue

@@ -121,6 +121,7 @@ export default {
             <component
               v-else-if="attr.is === 'el-popover-select-v2'"
               v-bind="attr"
+              :title="item.title"
               v-model="innerValue[item.key]"
               :source.sync="innerValue"
               style="width: 100%"
@@ -129,6 +130,7 @@ export default {
             <component
               v-else-if="attr.is === 'el-popover-multiple-select-v2'"
               v-bind="attr"
+              :title="item.title"
               v-model="innerValue[item.key]"
               :source.sync="innerValue"
               style="width: 100%"

src/components/super-search/index.vue

@@ -141,6 +141,7 @@ export default {
               v-if="attr.is === 'el-popover-select-v2'"
               v-bind="attr"
               v-model="innerValue[item.key]"
+              :title="item.title"
               :source.sync="innerValue"
               @change="$emit('submit')"
               style="width: 100%"
@@ -149,6 +150,7 @@ export default {
             <component
               v-if="attr.is === 'el-popover-multiple-select-v2'"
               v-bind="attr"
+              :title="item.title"
               v-model="innerValue[item.key]"
               :source.sync="innerValue"
               @change="$emit('submit')"

src/components/super-table/index.vue

@@ -382,6 +382,7 @@ export default {
                 v-else-if="attr.is === 'el-popover-select-v2'"
                 v-bind="attr"
                 v-model="scope.row[item.key]"
+                :title="item.title"
                 :size="$attrs.size"
                 :source.sync="scope.row"
               >
@@ -390,6 +391,7 @@ export default {
                 v-else-if="attr.is === 'el-popover-multiple-select-v2'"
                 v-bind="attr"
                 v-model="scope.row[item.key]"
+                :title="item.title"
                 :size="$attrs.size"
                 :source.sync="scope.row"
               >

src/views/material/requisition/add.vue

@@ -137,7 +137,8 @@
             <el-row :gutter="10">
               <el-col :span="6">
                 <el-form-item label="厂家物料编码" prop="manufacturersMaterialCode">
-                  <el-input type="number" min="0" :disabled="disable"
+                  <!-- type="number" -->
+                  <el-input :disabled="disable"
                             v-model="basicForm.manufacturersMaterialCode"></el-input>
                 </el-form-item>
               </el-col>
@@ -1259,7 +1260,7 @@
       getMidPackDetails(id) {
         getMidPack({id: id}).then(res => {
           if (res.code === 200) {
-            this.midPackOptions = res.data.tableBody
+            this.midPackOptions = res.data.tableBody;
           }
         })
       },

src/views/purchase/purchase-order/edit/index.vue

@@ -459,6 +459,7 @@ export default {
         });
         if (code == 200) {
           this.params = data;
+          
         }
       } catch (error) {
 
@@ -839,10 +840,15 @@ export default {
 
               <!-- 修订：不可删除、增行
               编辑：自制：可删可增 -->
-              <el-table-column fixed="right" label="操作" width="120">
-                <template slot-scope="scope">
+              <!-- v-if="!handleIsRevise()" -->
+              <el-table-column 
+                fixed="right" 
+                label="操作" 
+                width="120" >
+                <template slot-scope="scope"
+              >
+              <!-- v-if="!handleIsRevise()"  -->
                   <el-button 
-                    v-if="!handleIsRevise()" 
                     @click.native.prevent="delTableRow(params[tabName], scope.$index)" 
                     type="text" 
                     size="small"

src/views/purchase/purchase-order/edit/initColumn.js

@@ -66,9 +66,10 @@ export const forbidden = (isEdit,source) => {
     // 修订
     updateColumns.forEach(item => {
 
-      if (item.key == 'buyerName' || item.key == 'puDeptName' || item.key == 'deductionMoney' ||
-        item.key == 'supplierContactsName' || item.key == 'agentName' || 
-        item.key == 'rebateMoney' || item.key == 'remark') {
+      if (item.key == 'buyerName' || item.key == 'puDeptName'
+      || item.key === 'goodsAllocationName' || item.key === 'goodsWarehouseName' 
+      || item.key === 'warehouseName' || item.key == 'deductionMoney' 
+      || item.key == 'rebateMoney' ||item.key == 'remark' ) {
         item.disabled = false;
         item.readonly = false;
       } else {

src/views/purchase/purchase-order/index.vue

@@ -775,7 +775,6 @@ export default {
               convenitentOperation
               @select="handleTabSelect"
               @selection-change="handleTabSelectionChange"
-
             >
             </el-super-table>
           </div>

src/views/purchase/task/zhuan-pai/index.vue

@@ -35,9 +35,9 @@ export default {
   methods: {
     //
     open(prop) {
-      let arr = prop.filter((element) => element.status != '0');
+      let arr = prop.filter((element) => element.status != '0' && element.status != '3');
       if(arr.length > 0){
-        this.$modal.notifyWarning("您所选的单据中存在非自由态,无法进行操作，请确认数据！");
+        this.$modal.notifyWarning("您所选的单据中存在非自由态或已驳回,无法进行操作，请确认数据！");
         return;
       }
       this.params = prop;