cccc

src/api/BasicSettings.js

@@ -369,6 +369,12 @@ export function searchProcess(query) {
   if (query.is_effective !== '' && query.is_effective !== null && query.is_effective !== undefined) {
     params.append('is_effective', query.is_effective) // 你要传给后台的参数值 key/value
   }
+  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+  }
   params.append('pagesize', query.pagesize) // 你要传给后台的参数值 key/value
   params.append('pagenum', query.pagenum) // 你要传给后台的参数值 key/value
   return request({

src/views/BasicSettings/ApprovalProcess.vue

@@ -131,7 +131,9 @@ export default {
       // 审批流程列表查询加展示参数
       getemplist: {
         pagenum: 1,
-        pagesize: 10
+        pagesize: 10,
+        repositoryId: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionId
       },
       // 传给组件的数据
       personalForm: {},

src/views/CheckReport/AddCheckReport.vue

@@ -494,6 +494,7 @@ export default {
     // 源单为质检申请单时返回数据
     report(val) {
       console.log(val)
+      this.personalForm.sourceSerialNumber = val.id
       this.personalForm.productCode = val.productCode
       this.personalForm.productName = val.productName
       this.personalForm.unit = val.unit
@@ -507,6 +508,7 @@ export default {
     // 源单为采购到货单时返回数据
     report2(val) {
       console.log(val)
+      this.sourceSerialNumber = val.id
       this.personalForm.productCode = val.productCode
       this.personalForm.productName = val.productName
       this.personalForm.unit = val.unit
@@ -516,6 +518,7 @@ export default {
     // 源单为采购到货单时返回数据
     report3(val) {
       console.log(val)
+      this.sourceSerialNumber = val.id
       this.personalForm.productCode = val.productCode
       this.personalForm.productName = val.productName
       this.personalForm.unit = val.unit
@@ -523,6 +526,7 @@ export default {
       this.typeId = val.productType
     },
     mater(val) {
+      this.sourceSerialNumber = val.id
       this.personalForm.productCode = val.code
       this.personalForm.productName = val.productName
       this.personalForm.unit = val.produceMeasurement

src/views/ProduceTask/AddProduceTask.vue

@@ -246,6 +246,10 @@ export default {
         this.addpro = false
         this.addsouce = true
         this.$refs.editable.clear()
+      } else if (this.personalForm.sourceType === '3') {
+        this.addsouce = false
+        this.addpro = true
+        this.$refs.editable.clear()
       }
     },
     // 无来源添加商品

src/views/SaleOrder/AddSaleOrder.vue

@@ -12,6 +12,19 @@
                   <el-input v-model="personalForm.title" style="margin-left: 18px" clearable/>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item :label="$t('ProduceTask.sourceType')" prop="sourceType" style="width: 100%;">
+                  <el-select v-model="personalForm.sourceType" style="margin-left: 18px;width: 218px" @change="chooseType">
+                    <el-option value="1" label="无来源" />
+                    <el-option value="2" label="销售机会" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item :label="$t('SaleReturn.sourceNumber')" style="width: 100%;">
+                  <el-input v-model="personalForm.sourceNumber" :disabled="IsNumber" style="margin-left: 18px" clearable/>
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item :label="$t('SaleOrder.customerType')" prop="customerType" style="width: 100%;">
                   <el-select v-model="personalForm.customerType" style="margin-left: 18px;width: 218px" @change="clearCustomer">
@@ -438,7 +451,8 @@ export default {
         backMoney: '0.00',
         sendType: '2',
         currency: '1',
-        transDate: null
+        transDate: null,
+        sourceType: '1'
       },
       // 销售订单规则数据
       personalrules: {